From patchwork Thu Apr 11 14:39:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2429041 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 BE650DF230 for ; Thu, 11 Apr 2013 14:41:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B7B48E6664 for ; Thu, 11 Apr 2013 07:41:35 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by gabe.freedesktop.org (Postfix) with ESMTP id DDEDFE665B for ; Thu, 11 Apr 2013 07:41:26 -0700 (PDT) Received: by mail-ee0-f52.google.com with SMTP id d17so751906eek.25 for ; Thu, 11 Apr 2013 07:41:26 -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=NgOvv600SYKI9UYr83a6YH47t0+/0MwCz4QMQJPR710=; b=SRwzSxBWA57XDF2DxPIz39aRP+VsjNL1gWmtrNKwep1qw/T0RAQK9E7ZJ8tEywBEnc soORac8WMeFnjUs4Y0Ag1Ijm2Yl8WEH0qXKzDeeEo7QWtFM/rpVP3lDWau9huFGUcczj VzKWJnhncggxOaA1AMhgB+4hjuLbF9rpZABLs= 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=NgOvv600SYKI9UYr83a6YH47t0+/0MwCz4QMQJPR710=; b=T4CEr4u/bnowmjz1xQtaC578nnUZuC0SOAu1kWwf/TLA1NHkqmzavXreaz1q4RvvgN x+Qiuu+Vw1jMi11gNSfY3dgPIDUaAvikPBNpHb5AWL6Zo8gBmsMNL/fB4R+Do17IEPxe cptunQ7LoRF/dUXesKT1BGE8Lhw6I+UfBxvthiQ/qTerKQ+bG+Xs0HCxl0CvVgMi0FuQ GDtz5z7vgQ4pAltlhtNdlfCa0RKYLPeGPRwZ2PFgF+6mlIXwYMUYrHtT5eHVlg2++7FY qwlK5KWOQg7fBs6icLghdAMODgxQ2/Pb8NhqREqreH7fe+vSEamFEuDrRrIPuDPjg8fN 4ZAQ== X-Received: by 10.15.24.71 with SMTP id i47mr6258885eeu.0.1365691285927; Thu, 11 Apr 2013 07:41:25 -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 f47sm5924397eep.13.2013.04.11.07.41.24 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Apr 2013 07:41:24 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 11 Apr 2013 16:39:53 +0200 Message-Id: <1365691193-10212-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1365690550-5716-1-git-send-email-daniel.vetter@ffwll.ch> References: <1365690550-5716-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQmMITovtWe7jtMqiHUtfgiifQoKEpKULv5OJrA9ay4PPyNQJnZIcDLdNv2C50KQJpCYs/Mh 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. 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 1b2c744..95f92ba 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7629,6 +7629,9 @@ intel_modeset_affected_pipes(struct drm_crtc *crtc, unsigned *modeset_pipes, /* ... and mask these out. */ *modeset_pipes &= ~(*disable_pipes); *prepare_pipes &= ~(*disable_pipes); + + 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) @@ -7859,9 +7862,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);