From patchwork Tue Mar 29 13:43:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 671522 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2TDiG87018979 for ; Tue, 29 Mar 2011 13:44:37 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 931339ED5B for ; Tue, 29 Mar 2011 06:44:15 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (server109-228-6-236.live-servers.net [109.228.6.236]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D44C9E835 for ; Tue, 29 Mar 2011 06:43:57 -0700 (PDT) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.66.37; Received: from arrandale.alporthouse.com (unverified [78.156.66.37]) by fireflyinternet.com (Firefly Internet SMTP) with ESMTP id 30450043-1500050 for multiple; Tue, 29 Mar 2011 14:43:46 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 29 Mar 2011 14:43:46 +0100 Message-Id: <1301406226-13396-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 1.7.4.1 X-Originating-IP: 78.156.66.37 Subject: [Intel-gfx] [PATCH] drm/i915: Check whether the output is running after completing the modeswitch X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 29 Mar 2011 13:44:37 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5c7385b..ac9050d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3161,7 +3161,22 @@ static void i9xx_crtc_prepare(struct drm_crtc *crtc) static void i9xx_crtc_commit(struct drm_crtc *crtc) { + struct drm_i915_private *dev_priv = crtc->dev->dev_private; + int pipe = to_intel_crtc(crtc)->pipe; + i9xx_crtc_enable(crtc); + + if (INTEL_INFO(crtc->dev)->gen >= 4) { + u32 reg = PIPEDSL(pipe); + u32 line = I915_READ(reg); + if (wait_for(I915_READ(reg) != line, 50)) + DRM_ERROR("failed to switch modes, output not running\n"); + } else { + u32 reg = PIPEFRAMEPIXEL(pipe); + u32 pixel = I915_READ(reg) & PIPE_PIXEL_MASK; + if (wait_for((I915_READ(reg) & PIPE_PIXEL_MASK) != pixel, 50)) + DRM_ERROR("failed to switch modes, output not running\n"); + } } static void ironlake_crtc_prepare(struct drm_crtc *crtc) @@ -3171,7 +3186,16 @@ static void ironlake_crtc_prepare(struct drm_crtc *crtc) static void ironlake_crtc_commit(struct drm_crtc *crtc) { + struct drm_i915_private *dev_priv = crtc->dev->dev_private; + int pipe = to_intel_crtc(crtc)->pipe; + u32 reg = PIPEDSL(pipe); + u32 line; + ironlake_crtc_enable(crtc); + + line = I915_READ(reg); + if (wait_for(I915_READ(reg) != line, 50)) + DRM_ERROR("failed to switch modes, output not running\n"); } void intel_encoder_prepare (struct drm_encoder *encoder)