Attachment 114448 Details for Bug 89550 – possible fix

[patch] possible fix

0001-drm-i915-don-t-wait_for_vblank-if-the-CRTC-is-disabl.patch (text/plain), 1.66 KB, created by Paulo Zanoni on 2015-03-18 19:13:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo Zanoni

Created: 2015-03-18 19:13:49 UTC

Size: 1.66 KB

patch

obsolete

>From 883730cc0cb5ade87fa7723809b4948c2380e246 Mon Sep 17 00:00:00 2001
>From: Paulo Zanoni <paulo.r.zanoni@intel.com>
>Date: Wed, 18 Mar 2015 15:46:36 -0300
>Subject: [RFC] drm/i915: don't wait_for_vblank if the CRTC is disabled
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Otherwise we'll get a WARN from drm_wait_one_vblank() saying that
>vblanks are not available (since they were already disabled in
>crtc_disable()).
>
>This is certainly a regresison, but QA couldn't bisect it due to
>other regressions breaking the bisect.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89550
>Testcase: igt/pm_rpm/legacy-planes
>Testcase: igt/pm_rpm/legacy-planes-dpms
>Testcase: igt/pm_rpm/universal-planes
>Testcase: igt/pm_rpm/universal-planes-dpms
>Cc: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>Cc: Matt Roper <matthew.d.roper@intel.com>
>Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
>---
> drivers/gpu/drm/i915/intel_display.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>
>I'm not really sure if this is the best way to fix the regression. Ville and/or
>Matt should provide some comments here.
>
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index f1c0295..f2f7e81 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -12193,7 +12193,7 @@ static void intel_finish_crtc_commit(struct drm_crtc *crtc)
> 
> 	intel_runtime_pm_put(dev_priv);
> 
>-	if (intel_crtc->atomic.wait_vblank)
>+	if (intel_crtc->active && intel_crtc->atomic.wait_vblank)
> 		intel_wait_for_vblank(dev, intel_crtc->pipe);
> 
> 	intel_frontbuffer_flip(dev, intel_crtc->atomic.fb_bits);
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 89550: 114240 | 114448

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.