Skip to contentSkip to conversation

drm/i915: Drop RPM reference when CSR fails to load for BXT

PATCH In review Sagar Arun Kamble 2 participants 2 messages Oct 13, 2015 – Oct 14, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Drop RPM reference when CSR fails to load for BXT

RPM reference taken before CSR load is not dropped if CSR fails to load. As Display DC9 state that is entered on RPM suspend does not depend on CSR firmware, RPM reference can be dropped for BXT.

Cc Animesh Manna <[email protected]>
Cc A.Sunil Kamath <[email protected]>
Change-Id Ib25d64239adb30188f2c2f1b5ddc6a50c1f0e280
---
 drivers/gpu/drm/i915/intel_csr.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_csr.c +8 -1
index 9e530a7..48c8ad8 100644
@@ -406,8 +406,15 @@ static void finish_csr_load(const struct firmware *fw, void *context)
 out:
 	if (fw_loaded)
 		intel_runtime_pm_put(dev_priv);
-	else
+	else {
+		/*
+		* For BXT, on runtime suspend, display goes to DC9 which does not
+		* depend on CSR hence leave the RPM reference.
+		*/
+		if (IS_BROXTON(dev))
+			intel_runtime_pm_put(dev_priv);
 		intel_csr_load_status_set(dev_priv, FW_FAILED);
+	}
 
 	release_firmware(fw);
 }
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 8 lines · Sagar Arun Kamble

RPM reference taken before CSR load is not dropped if CSR fails to load. As Display DC9 state that is entered on RPM suspend does not depend on CSR firmware, RPM reference can be dropped for BXT.

Cc Animesh Manna <[email protected]>
Cc A.Sunil Kamath <[email protected]>
Change-Id Ib25d64239adb30188f2c2f1b5ddc6a50c1f0e280

Can we perhaps fix the dmc loader sync stuff first? There's a big patch series with patches from me and Animesh outstanding.
-Daniel

Quoted 32 lines
---
 drivers/gpu/drm/i915/intel_csr.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_csr.c +8 -1
index 9e530a7..48c8ad8 100644
@@ -406,8 +406,15 @@ static void finish_csr_load(const struct firmware *fw, void *context)
 out:
 	if (fw_loaded)
 		intel_runtime_pm_put(dev_priv);
-	else
+	else {
+		/*
+		* For BXT, on runtime suspend, display goes to DC9 which does not
+		* depend on CSR hence leave the RPM reference.
+		*/
+		if (IS_BROXTON(dev))
+			intel_runtime_pm_put(dev_priv);
 		intel_csr_load_status_set(dev_priv, FW_FAILED);
+	}
 
 	release_firmware(fw);
 }
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx