diff options
Diffstat (limited to 'drivers/gpu/drm/i915/selftests/i915_perf.c')
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/i915_perf.c | 16 | 
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/selftests/i915_perf.c b/drivers/gpu/drm/i915/selftests/i915_perf.c index 429c6d73b159..24dde5531423 100644 --- a/drivers/gpu/drm/i915/selftests/i915_perf.c +++ b/drivers/gpu/drm/i915/selftests/i915_perf.c @@ -102,6 +102,12 @@ test_stream(struct i915_perf *perf)  		I915_OA_FORMAT_A32u40_A4u32_B8_C8 : I915_OA_FORMAT_C4_B8,  	};  	struct i915_perf_stream *stream; +	struct intel_gt *gt; + +	if (!props.engine) +		return NULL; + +	gt = props.engine->gt;  	if (!oa_config)  		return NULL; @@ -116,12 +122,12 @@ test_stream(struct i915_perf *perf)  	stream->perf = perf; -	mutex_lock(&perf->lock); +	mutex_lock(>->perf.lock);  	if (i915_oa_stream_init(stream, ¶m, &props)) {  		kfree(stream);  		stream =  NULL;  	} -	mutex_unlock(&perf->lock); +	mutex_unlock(>->perf.lock);  	i915_oa_config_put(oa_config); @@ -130,11 +136,11 @@ test_stream(struct i915_perf *perf)  static void stream_destroy(struct i915_perf_stream *stream)  { -	struct i915_perf *perf = stream->perf; +	struct intel_gt *gt = stream->engine->gt; -	mutex_lock(&perf->lock); +	mutex_lock(>->perf.lock);  	i915_perf_destroy_locked(stream); -	mutex_unlock(&perf->lock); +	mutex_unlock(>->perf.lock);  }  static int live_sanitycheck(void *arg)  |