diff options
| author | Ville Syrjälä | 2013-03-27 16:49:13 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2013-03-27 17:48:11 +0100 |
| commit | c626d3179ce41c60c33390e2cdc4151246b689aa (patch) | |
| tree | 054abc75b21ca0c39c8cd5ef3667c6fc0b365af1 /drivers/gpu/drm/i915/intel_sprite.c | |
| parent | drm/i915: clear crt hotplug compare voltage field before setting (diff) | |
| download | kernel-qcow2-linux-c626d3179ce41c60c33390e2cdc4151246b689aa.tar.gz kernel-qcow2-linux-c626d3179ce41c60c33390e2cdc4151246b689aa.tar.xz kernel-qcow2-linux-c626d3179ce41c60c33390e2cdc4151246b689aa.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; |