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

Commit c4de0a5d authored by Eric Anholt's avatar Eric Anholt Committed by Dave Airlie
Browse files

drm/i915: Don't return busy for buffers left on the flushing list. 



These buffers don't have active rendering still occurring to them, they just
need either a flush to be emitted or a retire_requests to occur so that we
notice they're done.  Return unbusy so that one of the two occurs.  The two
expected consumers of this interface (OpenGL and libdrm_intel BO cache) both
want this behavior.

Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Acked-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 929096fe

drivers/gpu/drm/i915/i915_gem.c

+8 −1
Original line number Diff line number Diff line
@@ -2309,7 +2309,14 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, 
	}



	obj_priv = obj->driver_private;

	args->busy = obj_priv->active;

	/* Don't count being on the flushing list against the object being

	 * done.  Otherwise, a buffer left on the flushing list but not getting

	 * flushed (because nobody's flushing that domain) won't ever return

	 * unbusy and get reused by libdrm's bo cache.  The other expected

	 * consumer of this interface, OpenGL's occlusion queries, also specs

	 * that the objects get unbusy "eventually" without any interference.

	 */

	args->busy = obj_priv->active && obj_priv->last_rendering_seqno != 0;



	drm_gem_object_unreference(obj);

	mutex_unlock(&dev->struct_mutex);