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

Commit b93f9cf1 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: argument to control retiring behavior 



Sometimes it may be the case when we idle the gpu or wait on something
we don't actually want to process the retiring list. This patch allows
callers to choose the behavior.

Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Reviewed-by: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fc74d8e0

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -2131,7 +2131,7 @@ int i915_driver_unload(struct drm_device *dev) 
		unregister_shrinker(&dev_priv->mm.inactive_shrinker);



	mutex_lock(&dev->struct_mutex);

	ret = i915_gpu_idle(dev);

	ret = i915_gpu_idle(dev, true);

	if (ret)

		DRM_ERROR("failed to idle hardware: %d\n", ret);

	mutex_unlock(&dev->struct_mutex);

drivers/gpu/drm/i915/i915_drv.h

+3 −2
Original line number Diff line number Diff line
@@ -1179,13 +1179,14 @@ void i915_gem_do_init(struct drm_device *dev, 
		      unsigned long start,

		      unsigned long mappable_end,

		      unsigned long end);

int __must_check i915_gpu_idle(struct drm_device *dev);

int __must_check i915_gpu_idle(struct drm_device *dev, bool do_retire);

int __must_check i915_gem_idle(struct drm_device *dev);

int __must_check i915_add_request(struct intel_ring_buffer *ring,

				  struct drm_file *file,

				  struct drm_i915_gem_request *request);

int __must_check i915_wait_request(struct intel_ring_buffer *ring,

				   uint32_t seqno);

				   uint32_t seqno,

				   bool do_retire);

int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);

int __must_check

i915_gem_object_set_to_gtt_domain(struct drm_i915_gem_object *obj,

drivers/gpu/drm/i915/i915_gem.c

+16 −12
Original line number Diff line number Diff line
@@ -1943,7 +1943,8 @@ i915_gem_retire_work_handler(struct work_struct *work) 
 */

int

i915_wait_request(struct intel_ring_buffer *ring,

		  uint32_t seqno)

		  uint32_t seqno,

		  bool do_retire)

{

	drm_i915_private_t *dev_priv = ring->dev->dev_private;

	u32 ier;
@@ -2027,7 +2028,7 @@ i915_wait_request(struct intel_ring_buffer *ring, 
	 * buffer to have made it to the inactive list, and we would need

	 * a separate wait queue to handle that.

	 */

	if (ret == 0)

	if (ret == 0 && do_retire)

		i915_gem_retire_requests_ring(ring);



	return ret;
@@ -2051,7 +2052,8 @@ i915_gem_object_wait_rendering(struct drm_i915_gem_object *obj) 
	 * it.

	 */

	if (obj->active) {

		ret = i915_wait_request(obj->ring, obj->last_rendering_seqno);

		ret = i915_wait_request(obj->ring, obj->last_rendering_seqno,

					true);

		if (ret)

			return ret;

	}
@@ -2172,7 +2174,7 @@ i915_gem_flush_ring(struct intel_ring_buffer *ring, 
	return 0;

}



static int i915_ring_idle(struct intel_ring_buffer *ring)

static int i915_ring_idle(struct intel_ring_buffer *ring, bool do_retire)

{

	int ret;
@@ -2186,18 +2188,18 @@ static int i915_ring_idle(struct intel_ring_buffer *ring) 
			return ret;

	}



	return i915_wait_request(ring, i915_gem_next_request_seqno(ring));

	return i915_wait_request(ring, i915_gem_next_request_seqno(ring),

				 do_retire);

}



int

i915_gpu_idle(struct drm_device *dev)

int i915_gpu_idle(struct drm_device *dev, bool do_retire)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	int ret, i;



	/* Flush everything onto the inactive list. */

	for (i = 0; i < I915_NUM_RINGS; i++) {

		ret = i915_ring_idle(&dev_priv->ring[i]);

		ret = i915_ring_idle(&dev_priv->ring[i], do_retire);

		if (ret)

			return ret;

	}
@@ -2400,7 +2402,8 @@ i915_gem_object_flush_fence(struct drm_i915_gem_object *obj, 
		if (!ring_passed_seqno(obj->last_fenced_ring,

				       obj->last_fenced_seqno)) {

			ret = i915_wait_request(obj->last_fenced_ring,

						obj->last_fenced_seqno);

						obj->last_fenced_seqno,

						true);

			if (ret)

				return ret;

		}
@@ -2541,7 +2544,8 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj, 
				if (!ring_passed_seqno(obj->last_fenced_ring,

						       reg->setup_seqno)) {

					ret = i915_wait_request(obj->last_fenced_ring,

								reg->setup_seqno);

								reg->setup_seqno,

								true);

					if (ret)

						return ret;

				}
@@ -3710,7 +3714,7 @@ i915_gem_idle(struct drm_device *dev) 
		return 0;

	}



	ret = i915_gpu_idle(dev);

	ret = i915_gpu_idle(dev, true);

	if (ret) {

		mutex_unlock(&dev->struct_mutex);

		return ret;
@@ -4201,7 +4205,7 @@ i915_gem_inactive_shrink(struct shrinker *shrinker, struct shrink_control *sc) 
		 * This has a dramatic impact to reduce the number of

		 * OOM-killer events whilst running the GPU aggressively.

		 */

		if (i915_gpu_idle(dev) == 0)

		if (i915_gpu_idle(dev, true) == 0)

			goto rescan;

	}

	mutex_unlock(&dev->struct_mutex);

drivers/gpu/drm/i915/i915_gem_evict.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ i915_gem_evict_everything(struct drm_device *dev, bool purgeable_only) 
	trace_i915_gem_evict_everything(dev, purgeable_only);



	/* Flush everything (on to the inactive lists) and evict */

	ret = i915_gpu_idle(dev);

	ret = i915_gpu_idle(dev, true);

	if (ret)

		return ret;

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
			 * so every billion or so execbuffers, we need to stall

			 * the GPU in order to reset the counters.

			 */

			ret = i915_gpu_idle(dev);

			ret = i915_gpu_idle(dev, true);

			if (ret)

				goto err;