Re: [PATCH 03/40] drm/i915/selftests: Live tests emit requests and so require rpm

[Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxxxxxxx>]

On 19/09/2018 20:55, Chris Wilson wrote:
> As we emit requests or touch HW directly for some of the live tests, the
> requirement is that we hold the rpm wakeref before doing so. We want a
> mix of granularity since we will want to test runtime suspend, so try to
> mark up only the critical sections where we need rpm for the live test.
>
> Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> ---
>   drivers/gpu/drm/i915/selftests/i915_gem_coherency.c | 2 ++
>   drivers/gpu/drm/i915/selftests/i915_gem_context.c   | 4 ++++
>   drivers/gpu/drm/i915/selftests/i915_request.c       | 8 ++++++++
>   drivers/gpu/drm/i915/selftests/intel_guc.c          | 4 ++++
>   drivers/gpu/drm/i915/selftests/intel_lrc.c          | 8 ++++++++
>   drivers/gpu/drm/i915/selftests/intel_workarounds.c  | 5 +++++
>   6 files changed, 31 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_coherency.c b/drivers/gpu/drm/i915/selftests/i915_gem_coherency.c
> index 4e6a221063ac..f7392c1ffe75 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_gem_coherency.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_coherency.c
> @@ -298,6 +298,7 @@ static int igt_gem_coherency(void *arg)
>   	values = offsets + ncachelines;
>   
>   	mutex_lock(&i915->drm.struct_mutex);
> +	intel_runtime_pm_get(i915);
>   	for (over = igt_coherency_mode; over->name; over++) {
>   		if (!over->set)
>   			continue;
> @@ -375,6 +376,7 @@ static int igt_gem_coherency(void *arg)
>   		}
>   	}
>   unlock:
> +	intel_runtime_pm_put(i915);
>   	mutex_unlock(&i915->drm.struct_mutex);
>   	kfree(offsets);
>   	return err;
> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/selftests/i915_gem_context.c
> index 1c92560d35da..79f9bcaf0c05 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_context.c
> @@ -636,6 +636,8 @@ static int igt_switch_to_kernel_context(void *arg)
>   	 */
>   
>   	mutex_lock(&i915->drm.struct_mutex);
> +	intel_runtime_pm_get(i915);
> +
>   	ctx = kernel_context(i915);
>   	if (IS_ERR(ctx)) {
>   		mutex_unlock(&i915->drm.struct_mutex);
> @@ -658,6 +660,8 @@ static int igt_switch_to_kernel_context(void *arg)
>   	GEM_TRACE_DUMP_ON(err);
>   	if (igt_flush_test(i915, I915_WAIT_LOCKED))
>   		err = -EIO;
> +
> +	intel_runtime_pm_put(i915);
>   	mutex_unlock(&i915->drm.struct_mutex);
>   
>   	kernel_context_close(ctx);
> diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
> index c4aac6141e04..07e557815308 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_request.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_request.c
> @@ -342,6 +342,7 @@ static int live_nop_request(void *arg)
>   	 */
>   
>   	mutex_lock(&i915->drm.struct_mutex);
> +	intel_runtime_pm_get(i915);
>   
>   	for_each_engine(engine, i915, id) {
>   		struct i915_request *request = NULL;
> @@ -402,6 +403,7 @@ static int live_nop_request(void *arg)
>   	}
>   
>   out_unlock:
> +	intel_runtime_pm_put(i915);
>   	mutex_unlock(&i915->drm.struct_mutex);
>   	return err;
>   }
> @@ -487,6 +489,7 @@ static int live_empty_request(void *arg)
>   	 */
>   
>   	mutex_lock(&i915->drm.struct_mutex);
> +	intel_runtime_pm_get(i915);
>   
>   	batch = empty_batch(i915);
>   	if (IS_ERR(batch)) {
> @@ -550,6 +553,7 @@ static int live_empty_request(void *arg)
>   	i915_vma_unpin(batch);
>   	i915_vma_put(batch);
>   out_unlock:
> +	intel_runtime_pm_put(i915);
>   	mutex_unlock(&i915->drm.struct_mutex);
>   	return err;
>   }
> @@ -644,6 +648,7 @@ static int live_all_engines(void *arg)
>   	 */
>   
>   	mutex_lock(&i915->drm.struct_mutex);
> +	intel_runtime_pm_get(i915);
>   
>   	err = begin_live_test(&t, i915, __func__, "");
>   	if (err)
> @@ -726,6 +731,7 @@ static int live_all_engines(void *arg)
>   	i915_vma_unpin(batch);
>   	i915_vma_put(batch);
>   out_unlock:
> +	intel_runtime_pm_put(i915);
>   	mutex_unlock(&i915->drm.struct_mutex);
>   	return err;
>   }
> @@ -747,6 +753,7 @@ static int live_sequential_engines(void *arg)
>   	 */
>   
>   	mutex_lock(&i915->drm.struct_mutex);
> +	intel_runtime_pm_get(i915);
>   
>   	err = begin_live_test(&t, i915, __func__, "");
>   	if (err)
> @@ -853,6 +860,7 @@ static int live_sequential_engines(void *arg)
>   		i915_request_put(request[id]);
>   	}
>   out_unlock:
> +	intel_runtime_pm_put(i915);
>   	mutex_unlock(&i915->drm.struct_mutex);
>   	return err;
>   }
> diff --git a/drivers/gpu/drm/i915/selftests/intel_guc.c b/drivers/gpu/drm/i915/selftests/intel_guc.c
> index 90ba88c972cf..0c0ab82b6228 100644
> --- a/drivers/gpu/drm/i915/selftests/intel_guc.c
> +++ b/drivers/gpu/drm/i915/selftests/intel_guc.c
> @@ -142,6 +142,7 @@ static int igt_guc_clients(void *args)
>   
>   	GEM_BUG_ON(!HAS_GUC(dev_priv));
>   	mutex_lock(&dev_priv->drm.struct_mutex);
> +	intel_runtime_pm_get(dev_priv);
>   
>   	guc = &dev_priv->guc;
>   	if (!guc) {
> @@ -269,6 +270,7 @@ static int igt_guc_clients(void *args)
>   	guc_clients_create(guc);
>   	guc_clients_doorbell_init(guc);
>   unlock:
> +	intel_runtime_pm_put(dev_priv);
>   	mutex_unlock(&dev_priv->drm.struct_mutex);
>   	return err;
>   }
> @@ -287,6 +289,7 @@ static int igt_guc_doorbells(void *arg)
>   
>   	GEM_BUG_ON(!HAS_GUC(dev_priv));
>   	mutex_lock(&dev_priv->drm.struct_mutex);
> +	intel_runtime_pm_get(dev_priv);
>   
>   	guc = &dev_priv->guc;
>   	if (!guc) {
> @@ -379,6 +382,7 @@ static int igt_guc_doorbells(void *arg)
>   			guc_client_free(clients[i]);
>   		}
>   unlock:
> +	intel_runtime_pm_put(dev_priv);
>   	mutex_unlock(&dev_priv->drm.struct_mutex);
>   	return err;
>   }
> diff --git a/drivers/gpu/drm/i915/selftests/intel_lrc.c b/drivers/gpu/drm/i915/selftests/intel_lrc.c
> index 582566faef09..1aea7a8f2224 100644
> --- a/drivers/gpu/drm/i915/selftests/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/selftests/intel_lrc.c
> @@ -221,6 +221,7 @@ static int live_sanitycheck(void *arg)
>   		return 0;
>   
>   	mutex_lock(&i915->drm.struct_mutex);
> +	intel_runtime_pm_get(i915);
>   
>   	if (spinner_init(&spin, i915))
>   		goto err_unlock;
> @@ -261,6 +262,7 @@ static int live_sanitycheck(void *arg)
>   	spinner_fini(&spin);
>   err_unlock:
>   	igt_flush_test(i915, I915_WAIT_LOCKED);
> +	intel_runtime_pm_put(i915);
>   	mutex_unlock(&i915->drm.struct_mutex);
>   	return err;
>   }
> @@ -278,6 +280,7 @@ static int live_preempt(void *arg)
>   		return 0;
>   
>   	mutex_lock(&i915->drm.struct_mutex);
> +	intel_runtime_pm_get(i915);
>   
>   	if (spinner_init(&spin_hi, i915))
>   		goto err_unlock;
> @@ -350,6 +353,7 @@ static int live_preempt(void *arg)
>   	spinner_fini(&spin_hi);
>   err_unlock:
>   	igt_flush_test(i915, I915_WAIT_LOCKED);
> +	intel_runtime_pm_put(i915);
>   	mutex_unlock(&i915->drm.struct_mutex);
>   	return err;
>   }
> @@ -368,6 +372,7 @@ static int live_late_preempt(void *arg)
>   		return 0;
>   
>   	mutex_lock(&i915->drm.struct_mutex);
> +	intel_runtime_pm_get(i915);
>   
>   	if (spinner_init(&spin_hi, i915))
>   		goto err_unlock;
> @@ -440,6 +445,7 @@ static int live_late_preempt(void *arg)
>   	spinner_fini(&spin_hi);
>   err_unlock:
>   	igt_flush_test(i915, I915_WAIT_LOCKED);
> +	intel_runtime_pm_put(i915);
>   	mutex_unlock(&i915->drm.struct_mutex);
>   	return err;
>   
> @@ -467,6 +473,7 @@ static int live_preempt_hang(void *arg)
>   		return 0;
>   
>   	mutex_lock(&i915->drm.struct_mutex);
> +	intel_runtime_pm_get(i915);
>   
>   	if (spinner_init(&spin_hi, i915))
>   		goto err_unlock;
> @@ -561,6 +568,7 @@ static int live_preempt_hang(void *arg)
>   	spinner_fini(&spin_hi);
>   err_unlock:
>   	igt_flush_test(i915, I915_WAIT_LOCKED);
> +	intel_runtime_pm_put(i915);
>   	mutex_unlock(&i915->drm.struct_mutex);
>   	return err;
>   }
> diff --git a/drivers/gpu/drm/i915/selftests/intel_workarounds.c b/drivers/gpu/drm/i915/selftests/intel_workarounds.c
> index 0d39b3bf0c0d..d1a0923d2f38 100644
> --- a/drivers/gpu/drm/i915/selftests/intel_workarounds.c
> +++ b/drivers/gpu/drm/i915/selftests/intel_workarounds.c
> @@ -44,7 +44,9 @@ read_nonprivs(struct i915_gem_context *ctx, struct intel_engine_cs *engine)
>   	if (err)
>   		goto err_obj;
>   
> +	intel_runtime_pm_get(engine->i915);
>   	rq = i915_request_alloc(engine, ctx);
> +	intel_runtime_pm_put(engine->i915);
>   	if (IS_ERR(rq)) {
>   		err = PTR_ERR(rq);
>   		goto err_pin;
> @@ -175,7 +177,10 @@ static int switch_to_scratch_context(struct intel_engine_cs *engine)
>   	if (IS_ERR(ctx))
>   		return PTR_ERR(ctx);
>   
> +	intel_runtime_pm_get(engine->i915);
>   	rq = i915_request_alloc(engine, ctx);
> +	intel_runtime_pm_put(engine->i915);
> +
>   	kernel_context_close(ctx);
>   	if (IS_ERR(rq))
>   		return PTR_ERR(rq);

tl;dr; - if it passes CI:

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>

Should we have a rpm assert in i915_request_alloc? Or at least in the 
backend context pin if that's the only place where we can need it.

Regards,

Tvrtko

_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx