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

Commit 0be555b6 authored by Chris Wilson's avatar Chris Wilson Committed by Eric Anholt
Browse files

drm/i915: report all active objects as busy 



Incorporates a similar patch by Daniel Vetter, the alteration being to
report the current busy state after retiring.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 403c89ff

drivers/gpu/drm/i915/i915_gem.c

+26 −14
Original line number Diff line number Diff line
@@ -4365,22 +4365,34 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, 
	}



	mutex_lock(&dev->struct_mutex);

	/* Update the active list for the hardware's current position.

	 * Otherwise this only updates on a delayed timer or when irqs are

	 * actually unmasked, and our working set ends up being larger than

	 * required.

	 */

	i915_gem_retire_requests(dev);



	/* Count all active objects as busy, even if they are currently not used

	 * by the gpu. Users of this interface expect objects to eventually

	 * become non-busy without any further actions, therefore emit any

	 * necessary flushes here.

	 */

	obj_priv = to_intel_bo(obj);

	/* 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;

	if (args->busy) {

		/* Unconditionally flush objects, even when the gpu still uses this

		 * object. Userspace calling this function indicates that it wants to

		 * use this buffer rather sooner than later, so issuing the required

		 * flush earlier is beneficial.

		 */

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

		if (obj->write_domain) {

			i915_gem_flush(dev, 0, obj->write_domain);

			(void)i915_add_request(dev, file_priv, obj->write_domain, obj_priv->ring);

		}



		/* Update the active list for the hardware's current position.

		 * Otherwise this only updates on a delayed timer or when irqs

		 * are actually unmasked, and our working set ends up being

		 * larger than required.

		 */

		i915_gem_retire_requests_ring(dev, obj_priv->ring);



		args->busy = obj_priv->active;

	}



	drm_gem_object_unreference(obj);

	mutex_unlock(&dev->struct_mutex);