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

drm/i915: Kill obj->pending_flip 



The pending flip mask no longer set anywhere, so trying to wait for
while it's non-zero is a no-op. Remove it completely.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9abdda74

drivers/gpu/drm/i915/i915_drv.h

+0 −7
Original line number Diff line number Diff line
@@ -1215,13 +1215,6 @@ struct drm_i915_gem_object { 


	/** for phy allocated objects */

	struct drm_i915_gem_phys_object *phys_obj;



	/**

	 * Number of crtcs where this object is currently the fb, but

	 * will be page flipped away on the next vblank.  When it

	 * reaches 0, dev_priv->pending_flip_queue will be woken up.

	 */

	atomic_t pending_flip;

};

#define to_gem_object(obj) (&((struct drm_i915_gem_object *)(obj))->base)

drivers/gpu/drm/i915/intel_display.c

+0 −6
Original line number Diff line number Diff line
@@ -2226,12 +2226,6 @@ intel_finish_fb(struct drm_framebuffer *old_fb) 
	bool was_interruptible = dev_priv->mm.interruptible;

	int ret;



	WARN_ON(waitqueue_active(&dev_priv->pending_flip_queue));



	wait_event(dev_priv->pending_flip_queue,

		   i915_reset_in_progress(&dev_priv->gpu_error) ||

		   atomic_read(&obj->pending_flip) == 0);



	/* Big Hammer, we also need to ensure that any pending

	 * MI_WAIT_FOR_EVENT inside a user batch buffer on the

	 * current scanout is retired before unpinning the old

CRA Git | Maintained and supported by SUSTech CRA and CCSE