From: José Roberto de Souza <jose.souza@intel.com>
Date: Sat, 6 Apr 2019 00:51:11 +0000 (-0700)
Subject: drm/i915/psr: Initialize PSR mutex even when sink is not reliable
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=98c0d19ec72cd75ff85f9e84c52d11deb3c82032;p=linux.git

drm/i915/psr: Initialize PSR mutex even when sink is not reliable

Even when driver is reloaded and hits this scenario the PSR mutex
should be initialized, otherwise reading PSR debugfs status will
execute mutex_lock() over a mutex that was not initialized.

Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190406005112.27205-3-jose.souza@intel.com
---

diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index 361d231c888bd..cc8b5be68e893 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -1230,7 +1230,6 @@ void intel_psr_init(struct drm_i915_private *dev_priv)
 	if (val) {
 		DRM_DEBUG_KMS("PSR interruption error set\n");
 		dev_priv->psr.sink_not_reliable = true;
-		return;
 	}
 
 	/* Set link_standby x link_off defaults */