Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c626d317 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 85fc95ba

drivers/gpu/drm/i915/intel_sprite.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -582,6 +582,8 @@ intel_disable_plane(struct drm_plane *plane) 
	if (!intel_plane->obj)

	if (!intel_plane->obj)

		goto out;

		goto out;





	intel_wait_for_vblank(dev, intel_plane->pipe);



	mutex_lock(&dev->struct_mutex);

	mutex_lock(&dev->struct_mutex);

	intel_unpin_fb_obj(intel_plane->obj);

	intel_unpin_fb_obj(intel_plane->obj);

	intel_plane->obj = NULL;

	intel_plane->obj = NULL;