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

Commit 7d5e3799 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Reject changes of fb base when we have a flip pending 

This should be impossible due to the wait for outstanding flips that the
caller is meant to perform prior to updating the scanout base. Paranoia
tells me to check anyway.

References: https://bugs.freedesktop.org/show_bug.cgi?id=75502


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 22721343

drivers/gpu/drm/i915/intel_display.c

+24 −19
Original line number Diff line number Diff line
@@ -2321,6 +2321,25 @@ intel_finish_fb(struct drm_framebuffer *old_fb) 
	return ret;

}



static bool intel_crtc_has_pending_flip(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	unsigned long flags;

	bool pending;



	if (i915_reset_in_progress(&dev_priv->gpu_error) ||

	    intel_crtc->reset_counter != atomic_read(&dev_priv->gpu_error.reset_counter))

		return false;



	spin_lock_irqsave(&dev->event_lock, flags);

	pending = to_intel_crtc(crtc)->unpin_work != NULL;

	spin_unlock_irqrestore(&dev->event_lock, flags);



	return pending;

}



static int

intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,

		    struct drm_framebuffer *fb)
@@ -2331,6 +2350,11 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, 
	struct drm_framebuffer *old_fb;

	int ret;



	if (intel_crtc_has_pending_flip(crtc)) {

		DRM_ERROR("pipe is still busy with an old pageflip\n");

		return -EBUSY;

	}



	/* no fb bound */

	if (!fb) {

		DRM_ERROR("No FB bound\n");
@@ -2956,25 +2980,6 @@ static void ironlake_fdi_disable(struct drm_crtc *crtc) 
	udelay(100);

}



static bool intel_crtc_has_pending_flip(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	unsigned long flags;

	bool pending;



	if (i915_reset_in_progress(&dev_priv->gpu_error) ||

	    intel_crtc->reset_counter != atomic_read(&dev_priv->gpu_error.reset_counter))

		return false;



	spin_lock_irqsave(&dev->event_lock, flags);

	pending = to_intel_crtc(crtc)->unpin_work != NULL;

	spin_unlock_irqrestore(&dev->event_lock, flags);



	return pending;

}



bool intel_has_pending_fb_unpin(struct drm_device *dev)

{

	struct intel_crtc *crtc;