[1/3] drm/i915/guc: Fix return from guc_log_relay_file_create
diff mbox

Message ID 1517379279-12967-1-git-send-email-sagar.a.kamble@intel.com
State New
Headers show

Commit Message

sagar.a.kamble@intel.com Jan. 31, 2018, 6:14 a.m. UTC
guc_log_relay_file_create will return -EEXIST if we invoke
relay_late_setup_files multiple times as part of i915_guc_log_control.
However this is to be not cosidered as fail and need to return 0.
This was mistakenly introduced in the below commit. Fix it.

Fixes: 70deeaddc6e6 "drm/i915/guc: Fix lockdep due to log relay channel handling under struct_mutex"
Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
---
 drivers/gpu/drm/i915/intel_guc_log.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Chris Wilson Jan. 31, 2018, 9:36 a.m. UTC | #1
Quoting Sagar Arun Kamble (2018-01-31 06:14:37)
> guc_log_relay_file_create will return -EEXIST if we invoke
> relay_late_setup_files multiple times as part of i915_guc_log_control.
> However this is to be not cosidered as fail and need to return 0.
> This was mistakenly introduced in the below commit. Fix it.
> 
> Fixes: 70deeaddc6e6 "drm/i915/guc: Fix lockdep due to log relay channel handling under struct_mutex"
> Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>

Testcase?
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
sagar.a.kamble@intel.com Jan. 31, 2018, 9:49 a.m. UTC | #2
On 1/31/2018 3:06 PM, Chris Wilson wrote:
> Quoting Sagar Arun Kamble (2018-01-31 06:14:37)
>> guc_log_relay_file_create will return -EEXIST if we invoke
>> relay_late_setup_files multiple times as part of i915_guc_log_control.
>> However this is to be not cosidered as fail and need to return 0.
>> This was mistakenly introduced in the below commit. Fix it.
>>
>> Fixes: 70deeaddc6e6 "drm/i915/guc: Fix lockdep due to log relay channel handling under struct_mutex"
>> Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Testcase?
Yes. will include.
Thanks for the review.
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> -Chris

Patch
diff mbox

diff --git a/drivers/gpu/drm/i915/intel_guc_log.c b/drivers/gpu/drm/i915/intel_guc_log.c
index 86a3321..3fbe93a 100644
--- a/drivers/gpu/drm/i915/intel_guc_log.c
+++ b/drivers/gpu/drm/i915/intel_guc_log.c
@@ -185,6 +185,8 @@  static int guc_log_relay_file_create(struct intel_guc *guc)
 		goto out_unlock;
 	}
 
+	ret = 0;
+
 out_unlock:
 	mutex_unlock(&guc->log.runtime.relay_lock);
 	return ret;