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

Commit 2f530945 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Stop passing I915_WAIT_LOCKED to i915_request_wait() 



Since commit eb8d0f5a ("drm/i915: Remove GPU reset dependence on
struct_mutex"), the I915_WAIT_LOCKED flags passed to i915_request_wait()
has been defunct. Now go ahead and remove it from all callers.

References: eb8d0f5a ("drm/i915: Remove GPU reset dependence on struct_mutex")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190618074153.16055-3-chris@chris-wilson.co.uk
parent 73591341

drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c

+4 −10
Original line number Diff line number Diff line
@@ -83,9 +83,7 @@ static int live_nop_switch(void *arg) 
			}

			i915_request_add(rq);

		}

		if (i915_request_wait(rq,

				      I915_WAIT_LOCKED,

				      HZ / 5) < 0) {

		if (i915_request_wait(rq, 0, HZ / 5) < 0) {

			pr_err("Failed to populated %d contexts\n", nctx);

			i915_gem_set_wedged(i915);

			err = -EIO;
@@ -128,9 +126,7 @@ static int live_nop_switch(void *arg) 


				i915_request_add(rq);

			}

			if (i915_request_wait(rq,

					      I915_WAIT_LOCKED,

					      HZ / 5) < 0) {

			if (i915_request_wait(rq, 0, HZ / 5) < 0) {

				pr_err("Switching between %ld contexts timed out\n",

				       prime);

				i915_gem_set_wedged(i915);
@@ -893,7 +889,7 @@ __read_slice_count(struct drm_i915_private *i915, 
	if (spin)

		igt_spinner_end(spin);



	ret = i915_request_wait(rq, I915_WAIT_LOCKED, MAX_SCHEDULE_TIMEOUT);

	ret = i915_request_wait(rq, 0, MAX_SCHEDULE_TIMEOUT);

	i915_request_put(rq);

	if (ret < 0)

		return ret;
@@ -980,9 +976,7 @@ __sseu_finish(struct drm_i915_private *i915, 
		igt_spinner_end(spin);



	if ((flags & TEST_IDLE) && ret == 0) {

		ret = i915_gem_wait_for_idle(i915,

					     I915_WAIT_LOCKED,

					     MAX_SCHEDULE_TIMEOUT);

		ret = i915_gem_wait_for_idle(i915, 0, MAX_SCHEDULE_TIMEOUT);

		if (ret)

			return ret;

drivers/gpu/drm/i915/gt/intel_ringbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1815,7 +1815,7 @@ static noinline int wait_for_space(struct intel_ring *ring, unsigned int bytes) 
		return -ENOSPC;



	timeout = i915_request_wait(target,

				    I915_WAIT_INTERRUPTIBLE | I915_WAIT_LOCKED,

				    I915_WAIT_INTERRUPTIBLE,

				    MAX_SCHEDULE_TIMEOUT);

	if (timeout < 0)

		return timeout;

drivers/gpu/drm/i915/gt/intel_workarounds.c

+1 −1
Original line number Diff line number Diff line
@@ -1435,7 +1435,7 @@ static int engine_wa_list_verify(struct intel_context *ce, 
		goto err_vma;



	i915_request_add(rq);

	if (i915_request_wait(rq, I915_WAIT_LOCKED, HZ / 5) < 0) {

	if (i915_request_wait(rq, 0, HZ / 5) < 0) {

		err = -ETIME;

		goto err_vma;

	}

drivers/gpu/drm/i915/gt/selftest_hangcheck.c

+3 −6
Original line number Diff line number Diff line
@@ -339,8 +339,7 @@ static int igt_hang_sanitycheck(void *arg) 


		timeout = 0;

		igt_wedge_on_timeout(&w, i915, HZ / 10 /* 100ms timeout*/)

			timeout = i915_request_wait(rq,

						    I915_WAIT_LOCKED,

			timeout = i915_request_wait(rq, 0,

						    MAX_SCHEDULE_TIMEOUT);

		if (i915_reset_failed(i915))

			timeout = -EIO;
@@ -1098,7 +1097,7 @@ static int igt_reset_wait(void *arg) 


	reset_count = fake_hangcheck(i915, ALL_ENGINES);



	timeout = i915_request_wait(rq, I915_WAIT_LOCKED, 10);

	timeout = i915_request_wait(rq, 0, 10);

	if (timeout < 0) {

		pr_err("i915_request_wait failed on a stuck request: err=%ld\n",

		       timeout);
@@ -1666,9 +1665,7 @@ static int igt_atomic_reset_engine(struct intel_engine_cs *engine, 
		struct igt_wedge_me w;



		igt_wedge_on_timeout(&w, i915, HZ / 20 /* 50ms timeout*/)

			i915_request_wait(rq,

					  I915_WAIT_LOCKED,

					  MAX_SCHEDULE_TIMEOUT);

			i915_request_wait(rq, 0, MAX_SCHEDULE_TIMEOUT);

		if (i915_reset_failed(i915))

			err = -EIO;

	}

drivers/gpu/drm/i915/gt/selftest_lrc.c

+9 −15
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static int live_busywait_preempt(void *arg) 
		}



		/* Low priority request should be busywaiting now */

		if (i915_request_wait(lo, I915_WAIT_LOCKED, 1) != -ETIME) {

		if (i915_request_wait(lo, 0, 1) != -ETIME) {

			pr_err("%s: Busywaiting request did not!\n",

			       engine->name);

			err = -EIO;
@@ -220,7 +220,7 @@ static int live_busywait_preempt(void *arg) 
		intel_ring_advance(hi, cs);

		i915_request_add(hi);



		if (i915_request_wait(lo, I915_WAIT_LOCKED, HZ / 5) < 0) {

		if (i915_request_wait(lo, 0, HZ / 5) < 0) {

			struct drm_printer p = drm_info_printer(i915->drm.dev);



			pr_err("%s: Failed to preempt semaphore busywait!\n",
@@ -739,7 +739,6 @@ static int live_suppress_wait_preempt(void *arg) 
			GEM_BUG_ON(!i915_request_started(rq[0]));



			if (i915_request_wait(rq[depth],

					      I915_WAIT_LOCKED |

					      I915_WAIT_PRIORITY,

					      1) != -ETIME) {

				pr_err("%s: Waiter depth:%d completed!\n",
@@ -841,7 +840,7 @@ static int live_chain_preempt(void *arg) 
			 __func__, engine->name, ring_size);



		igt_spinner_end(&lo.spin);

		if (i915_request_wait(rq, I915_WAIT_LOCKED, HZ / 2) < 0) {

		if (i915_request_wait(rq, 0, HZ / 2) < 0) {

			pr_err("Timed out waiting to flush %s\n", engine->name);

			goto err_wedged;

		}
@@ -882,7 +881,7 @@ static int live_chain_preempt(void *arg) 
			engine->schedule(rq, &attr);



			igt_spinner_end(&hi.spin);

			if (i915_request_wait(rq, I915_WAIT_LOCKED, HZ / 5) < 0) {

			if (i915_request_wait(rq, 0, HZ / 5) < 0) {

				struct drm_printer p =

					drm_info_printer(i915->drm.dev);
@@ -898,7 +897,7 @@ static int live_chain_preempt(void *arg) 
			if (IS_ERR(rq))

				goto err_wedged;

			i915_request_add(rq);

			if (i915_request_wait(rq, I915_WAIT_LOCKED, HZ / 5) < 0) {

			if (i915_request_wait(rq, 0, HZ / 5) < 0) {

				struct drm_printer p =

					drm_info_printer(i915->drm.dev);
@@ -1396,9 +1395,7 @@ static int nop_virtual_engine(struct drm_i915_private *i915, 
		}



		for (nc = 0; nc < nctx; nc++) {

			if (i915_request_wait(request[nc],

					      I915_WAIT_LOCKED,

					      HZ / 10) < 0) {

			if (i915_request_wait(request[nc], 0, HZ / 10) < 0) {

				pr_err("%s(%s): wait for %llx:%lld timed out\n",

				       __func__, ve[0]->engine->name,

				       request[nc]->fence.context,
@@ -1545,7 +1542,7 @@ static int mask_virtual_engine(struct drm_i915_private *i915, 
	}



	for (n = 0; n < nsibling; n++) {

		if (i915_request_wait(request[n], I915_WAIT_LOCKED, HZ / 10) < 0) {

		if (i915_request_wait(request[n], 0, HZ / 10) < 0) {

			pr_err("%s(%s): wait for %llx:%lld timed out\n",

			       __func__, ve->engine->name,

			       request[n]->fence.context,
@@ -1720,9 +1717,7 @@ static int bond_virtual_engine(struct drm_i915_private *i915, 
		}

		onstack_fence_fini(&fence);



		if (i915_request_wait(rq[0],

				      I915_WAIT_LOCKED,

				      HZ / 10) < 0) {

		if (i915_request_wait(rq[0], 0, HZ / 10) < 0) {

			pr_err("Master request did not execute (on %s)!\n",

			       rq[0]->engine->name);

			err = -EIO;
@@ -1730,8 +1725,7 @@ static int bond_virtual_engine(struct drm_i915_private *i915, 
		}



		for (n = 0; n < nsibling; n++) {

			if (i915_request_wait(rq[n + 1],

					      I915_WAIT_LOCKED,

			if (i915_request_wait(rq[n + 1], 0,

					      MAX_SCHEDULE_TIMEOUT) < 0) {

				err = -EIO;

				goto out;