OSDN Git Service

drm/i915/guc: Fix return from guc_log_relay_file_create
authorSagar Arun Kamble <sagar.a.kamble@intel.com>
Wed, 31 Jan 2018 06:14:37 +0000 (11:44 +0530)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 31 Jan 2018 10:46:02 +0000 (10:46 +0000)
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>
Link: https://patchwork.freedesktop.org/patch/msgid/1517379279-12967-1-git-send-email-sagar.a.kamble@intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/intel_guc_log.c

index 86a3321..3fbe93a 100644 (file)
@@ -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;