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

Commit 7a194876 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Emit a request to clear a flushed and idle ring for unbusy bo 



In order for bos to retire eventually, a request must be sent down the
ring. This is expected, for example, by occlusion queries for which mesa
will wait upon (whilst running glean) before issuing more batches and so
the normal activity upon the ring is suspended and we need to emit a
request to clear the idle ring.

Reported-by: default avatarJinjin, Wang <jinjin.wang@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30380


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 2a1292fd

drivers/gpu/drm/i915/i915_gem.c

+11 −1
Original line number Diff line number Diff line
@@ -4374,10 +4374,20 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, 
		 * use this buffer rather sooner than later, so issuing the required

		 * flush earlier is beneficial.

		 */

		if (obj->write_domain & I915_GEM_GPU_DOMAINS)

		if (obj->write_domain & I915_GEM_GPU_DOMAINS) {

			i915_gem_flush_ring(dev, file_priv,

					    obj_priv->ring,

					    0, obj->write_domain);

		} else if (obj_priv->ring->outstanding_lazy_request) {

			/* This ring is not being cleared by active usage,

			 * so emit a request to do so.

			 */

			u32 seqno = i915_add_request(dev,

						     NULL, NULL,

						     obj_priv->ring);

			if (seqno == 0)

				ret = -ENOMEM;

		}



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

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