[PATCH v4 11/27] drm/i915: do not wait for vblank when crtc is off

Maarten Lankhorst
2015-06-01T10:50:32Z

This can happen when turning off a sprite plane. Because the crtc state
is not yet always swapped correctly and transitional helpers are used
the crtc state cannot be relied on.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3b36e1f24c4e..93ac7c29f210 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13510,7 +13510,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->atomic.wait_vblank && intel_crtc->active)
intel_wait_for_vblank(dev, intel_crtc->pipe);

intel_frontbuffer_flip(dev, intel_crtc->atomic.fb_bits);