From patchwork Thu Apr 11 17:49:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2429801 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id D8F27DF230 for ; Thu, 11 Apr 2013 17:50:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C8705E6669 for ; Thu, 11 Apr 2013 10:50:49 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f42.google.com (mail-ee0-f42.google.com [74.125.83.42]) by gabe.freedesktop.org (Postfix) with ESMTP id E1670E5EA0 for ; Thu, 11 Apr 2013 10:50:40 -0700 (PDT) Received: by mail-ee0-f42.google.com with SMTP id d4so871969eek.1 for ; Thu, 11 Apr 2013 10:50:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=tjwtLNkVtL8DHL4vWuyg+p4oMIxPsvrvGyQffK3NbKY=; b=XM6fah6J3m6Bocxi4NFmKp55qxuB/39YPCnZDqFS0FCdcHXNZ/CVOBlz5N86GyVZbo Wwipqii8IqvO4WroxuxpO4q6l7pXmzyI86fqIkdEdZV3hekQMoT94VPnNcVGF1PF6wbO f6SoNVvbNHd7/wRRsuEfca7ZwO2TBxmihZGnU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=tjwtLNkVtL8DHL4vWuyg+p4oMIxPsvrvGyQffK3NbKY=; b=YDqpcBsi1U34QONsT0bFMk2fGh2yJIDJD3rLLJTyx7Q9mNghIYDj8HbAnRDf/xz77S sIgG1QyHRiyMinStofBT6CQnlaXI0tgAas7fWzvuJiE0TMvFZP0eXaO0s3zt6yhMed4X nps/h/Z5WY7P6KdQqImrwaBE4b04xG3pDU2MM8aeSAjMLmMzBtqfECa7pb7gLQV0kxEY lV13WQP14rAyPaIhBxdECU2rBEYLwd9ScMrSweLXhUv7jm9/zjWTAxwE5mb88Tvu+a9A ZxJXlanMRQ80D1eW59k8sdf6VYaCP/2J8TeN7Vy54OWGCfKeiW2WGCenfe+bcOm/NnrV A1Lw== X-Received: by 10.15.36.135 with SMTP id i7mr19097974eev.34.1365702639816; Thu, 11 Apr 2013 10:50:39 -0700 (PDT) Received: from gina.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id cd3sm6844987eeb.6.2013.04.11.10.50.37 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Apr 2013 10:50:38 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 11 Apr 2013 19:49:07 +0200 Message-Id: <1365702547-12936-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20130411172717.GB4469@intel.com> References: <20130411172717.GB4469@intel.com> X-Gm-Message-State: ALoCoQm81LFoUplBskr5YOh1C7DF/Z0UjmL5CDMVsghhnuLKRvA88fzMObul6dElewW4G+6rWCC6 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: move debug output back to the right place X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org When adding the pipe config computation step I've accidentally moved this a bit away. Which momentarily confused me since the pipe config step rejected some modesetting operations I expected and so left me looking in vain for that debug output. v2: Move the debug output into the right function to prevent this from happening again. v3: Make it compile (Ville). Also reorder the patch so that the two bugfixes are first. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ea7ded1..47c540e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7647,6 +7647,9 @@ intel_modeset_affected_pipes(struct drm_crtc *crtc, unsigned *modeset_pipes, /* HACK: We don't (yet) fully support global modesets. */ *modeset_pipes &= 1 << intel_crtc->pipe; *prepare_pipes &= 1 << intel_crtc->pipe; + + DRM_DEBUG_KMS("set mode pipe masks: modeset: %x, prepare: %x, disable: %x\n", + *modeset_pipes, *prepare_pipes, *disable_pipes); } static bool intel_crtc_in_use(struct drm_crtc *crtc) @@ -7877,9 +7880,6 @@ int intel_set_mode(struct drm_crtc *crtc, } } - DRM_DEBUG_KMS("set mode pipe masks: modeset: %x, prepare: %x, disable: %x\n", - modeset_pipes, prepare_pipes, disable_pipes); - for_each_intel_crtc_masked(dev, disable_pipes, intel_crtc) intel_crtc_disable(&intel_crtc->base);