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

Commit dc3f82c2 authored by Chia-I Wu's avatar Chia-I Wu Committed by Chris Wilson
Browse files

drm/i915: Fix current fb blocking for page flip 



Block execbuffer for the fb to be flipped away, not the one that is to
be flipped in.

[ickle: rewritten for -next]
Signed-off-by: default avatarChia-I Wu <olvaffe@gmail.com>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Acked-by: default avatarKristian Høgsberg <krh@bitplanet.net>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent f00a3ddf

drivers/gpu/drm/i915/intel_display.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -4991,9 +4991,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev, 




	spin_unlock_irqrestore(&dev->event_lock, flags);

	spin_unlock_irqrestore(&dev->event_lock, flags);





	obj_priv = to_intel_bo(work->pending_flip_obj);

	obj_priv = to_intel_bo(work->old_fb_obj);



	/* Initial scanout buffer will have a 0 pending flip count */

	atomic_clear_mask(1 << intel_crtc->plane,

	atomic_clear_mask(1 << intel_crtc->plane,

			  &obj_priv->pending_flip.counter);

			  &obj_priv->pending_flip.counter);

	if (atomic_read(&obj_priv->pending_flip) == 0)

	if (atomic_read(&obj_priv->pending_flip) == 0)
@@ -5092,9 +5090,14 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, 
	if (ret)

	if (ret)

		goto cleanup_objs;

		goto cleanup_objs;





	obj_priv = to_intel_bo(obj);

	/* Block clients from rendering to the new back buffer until

	atomic_add(1 << intel_crtc->plane, &obj_priv->pending_flip);

	 * the flip occurs and the object is no longer visible.

	 */

	atomic_add(1 << intel_crtc->plane,

		   &to_intel_bo(work->old_fb_obj)->pending_flip);



	work->pending_flip_obj = obj;

	work->pending_flip_obj = obj;

	obj_priv = to_intel_bo(obj);





	if (IS_GEN3(dev) || IS_GEN2(dev)) {

	if (IS_GEN3(dev) || IS_GEN2(dev)) {

		u32 flip_mask;

		u32 flip_mask;