From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Wed, 27 Mar 2013 15:49:13 +0000 (+0200)
Subject: drm/i915: Wait for vblank between disabling a sprite and unpinning the fb
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c626d3179ce41c60c33390e2cdc4151246b689aa;p=openwrt%2Fstaging%2Fblogic.git

drm/i915: Wait for vblank between disabling a sprite and unpinning the fb

When disabling a sprite, wait for the sprite to stop fetching data
from memory before unpinning the fb.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 414d325f28d3..27df5b871be5 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -582,6 +582,8 @@ intel_disable_plane(struct drm_plane *plane)
 	if (!intel_plane->obj)
 		goto out;
 
+	intel_wait_for_vblank(dev, intel_plane->pipe);
+
 	mutex_lock(&dev->struct_mutex);
 	intel_unpin_fb_obj(intel_plane->obj);
 	intel_plane->obj = NULL;