From patchwork Thu Apr 11 14:29:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2428961 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 1A5ABDF230 for ; Thu, 11 Apr 2013 14:30:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E83CE5DEB for ; Thu, 11 Apr 2013 07:30:57 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f174.google.com (mail-ea0-f174.google.com [209.85.215.174]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DDFFE5DEB for ; Thu, 11 Apr 2013 07:30:45 -0700 (PDT) Received: by mail-ea0-f174.google.com with SMTP id m14so766410eaj.19 for ; Thu, 11 Apr 2013 07:30:44 -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; bh=2a4SClWNVh+9c5cM2bJlYcpAooRMjauycknyp9gdLX0=; b=Hl5+IlJhasnB1OrSr+uNyI9BhBPATc9OYhs6gs2sMae8pveq8Y3ThprwAfRlIOo2ZI I5GZUMft6xk+iawaxjups0RXNDvn2McGlVUhJFL7jz9yhqJif4o+Z0GgblroF3I1/ENo /7V8BacjNfrKkkr3E+iztwyuU2UTlBRwRQZrM= 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 :x-gm-message-state; bh=2a4SClWNVh+9c5cM2bJlYcpAooRMjauycknyp9gdLX0=; b=WeGkk9wut5gBmwh6bfWzhy7n+l5yOVO2j+KdEFNNHpvmIN7zGTy91CvqZ8/aovNkES 49QXWV7A1Nr0FyU0Ml/D5Oh2OvbXQZA+HY509fGPOl/jKh3aCBvIHnR2bEdi1a5mHm2e UmWnN3o9g3BG873PPIi9GzPcbXJ5W6LzT6s39QgKtU25m+VsHGitz1GKzAn014FZJEZB TbimbeNHX7AH5UzlAlsGHx1XjXF+5oU18lWxAQ4qH3vufMCqCH1r4sO+j6xhhagZ97KD tww1H7onWZq4ieL1Ywy4OlOm8COBnk70zCxtOONqrZ+0khw9YMpCPRjWazvplpsLbBIl D+RA== X-Received: by 10.15.41.2 with SMTP id r2mr17563226eev.20.1365690644368; Thu, 11 Apr 2013 07:30:44 -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 a41sm5965845eei.4.2013.04.11.07.30.42 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Apr 2013 07:30:43 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 11 Apr 2013 16:29:04 +0200 Message-Id: <1365690550-5716-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkZkjpYCzsvelf7gaLfW0TceTqEHvo5VMxC8L7UBs7quGvcKSZWiofPFY7yRlD5h0iOSIsl Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 1/7] 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. 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..f60493b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7841,6 +7841,9 @@ int intel_set_mode(struct drm_crtc *crtc, intel_modeset_affected_pipes(crtc, &modeset_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); + *saved_hwmode = crtc->hwmode; *saved_mode = crtc->mode; @@ -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);