From: Sagar Arun Kamble Date: Wed, 31 Jan 2018 11:44:37 +0530 Subject: drm/i915/guc: Fix return from guc_log_relay_file_create Git-commit: b1852d362f31ac0c233e7c7b040f7c58bd381267 Patch-mainline: v4.17-rc1 References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166 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 Cc: Chris Wilson Cc: Michal Wajdeczko Link: https://patchwork.freedesktop.org/patch/msgid/1517379279-12967-1-git-send-email-sagar.a.kamble@intel.com Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson Acked-by: Petr Tesarik --- drivers/gpu/drm/i915/intel_guc_log.c | 2 ++ 1 file changed, 2 insertions(+) --- 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(str goto out_unlock; } + ret = 0; + out_unlock: mutex_unlock(&guc->log.runtime.relay_lock); return ret;