drm/i915/selftests: Drop stale struct_mutex
diff mbox series

Message ID 20191015085911.10317-1-chris@chris-wilson.co.uk
State New
Headers show
Series
  • drm/i915/selftests: Drop stale struct_mutex
Related show

Commit Message

Chris Wilson Oct. 15, 2019, 8:59 a.m. UTC
A lately added test was missed when applying the struct_mutex removal
patches. Do so now.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/gt/selftest_lrc.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

Comments

Tvrtko Ursulin Oct. 16, 2019, 8:16 a.m. UTC | #1
On 15/10/2019 09:59, Chris Wilson wrote:
> A lately added test was missed when applying the struct_mutex removal
> patches. Do so now.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>   drivers/gpu/drm/i915/gt/selftest_lrc.c | 9 +--------
>   1 file changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> index 1276da059dc6..9c1f34fb5882 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
> @@ -107,7 +107,6 @@ static int live_unlite_restore(struct drm_i915_private *i915, int prio)
>   	struct intel_engine_cs *engine;
>   	struct i915_gem_context *ctx;
>   	enum intel_engine_id id;
> -	intel_wakeref_t wakeref;
>   	struct igt_spinner spin;
>   	int err = -ENOMEM;
>   
> @@ -116,11 +115,8 @@ static int live_unlite_restore(struct drm_i915_private *i915, int prio)
>   	 * on the same engine from the same parent context.
>   	 */
>   
> -	mutex_lock(&i915->drm.struct_mutex);
> -	wakeref = intel_runtime_pm_get(&i915->runtime_pm);
> -
>   	if (igt_spinner_init(&spin, &i915->gt))
> -		goto err_unlock;
> +		return err;
>   
>   	ctx = kernel_context(i915);
>   	if (!ctx)
> @@ -264,9 +260,6 @@ static int live_unlite_restore(struct drm_i915_private *i915, int prio)
>   	kernel_context_close(ctx);
>   err_spin:
>   	igt_spinner_fini(&spin);
> -err_unlock:
> -	intel_runtime_pm_put(&i915->runtime_pm, wakeref);
> -	mutex_unlock(&i915->drm.struct_mutex);
>   	return err;
>   }
>   
> 

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

Regards,

Tvrtko

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
index 1276da059dc6..9c1f34fb5882 100644
--- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
@@ -107,7 +107,6 @@  static int live_unlite_restore(struct drm_i915_private *i915, int prio)
 	struct intel_engine_cs *engine;
 	struct i915_gem_context *ctx;
 	enum intel_engine_id id;
-	intel_wakeref_t wakeref;
 	struct igt_spinner spin;
 	int err = -ENOMEM;
 
@@ -116,11 +115,8 @@  static int live_unlite_restore(struct drm_i915_private *i915, int prio)
 	 * on the same engine from the same parent context.
 	 */
 
-	mutex_lock(&i915->drm.struct_mutex);
-	wakeref = intel_runtime_pm_get(&i915->runtime_pm);
-
 	if (igt_spinner_init(&spin, &i915->gt))
-		goto err_unlock;
+		return err;
 
 	ctx = kernel_context(i915);
 	if (!ctx)
@@ -264,9 +260,6 @@  static int live_unlite_restore(struct drm_i915_private *i915, int prio)
 	kernel_context_close(ctx);
 err_spin:
 	igt_spinner_fini(&spin);
-err_unlock:
-	intel_runtime_pm_put(&i915->runtime_pm, wakeref);
-	mutex_unlock(&i915->drm.struct_mutex);
 	return err;
 }