public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: decouple runtime PM enablement from DMC presence
@ 2017-06-14 17:12 matthew.s.atwood
  2017-06-14 17:33 ` Imre Deak
  2017-06-14 17:40 ` ✗ Fi.CI.BAT: failure for " Patchwork
  0 siblings, 2 replies; 18+ messages in thread
From: matthew.s.atwood @ 2017-06-14 17:12 UTC (permalink / raw)
  To: intel-gfx; +Cc: marcheu, Matt Atwood

From: Matt Atwood <matthew.s.atwood@intel.corp-partner.google.com>

Runtime PM is disabled when DMC firmware is not present. Runtime PM is still
enabled even if DMC firmware fails to load. This patch enables runtime PM to
be enabled if DMC firmware is not present.

Signed-off-by: Matt Atwood <matthew.s.atwood@intel.corp-partner.google.com>
---
 drivers/gpu/drm/i915/intel_csr.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 965988f..3e4e705 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -411,8 +411,6 @@ static void csr_load_work_fn(struct work_struct *work)
 	if (dev_priv->csr.dmc_payload) {
 		intel_csr_load_program(dev_priv);
 
-		intel_display_power_put(dev_priv, POWER_DOMAIN_INIT);
-
 		DRM_INFO("Finished loading DMC firmware %s (v%u.%u)\n",
 			 dev_priv->csr.fw_path,
 			 CSR_VERSION_MAJOR(csr->version),
@@ -420,10 +418,11 @@ static void csr_load_work_fn(struct work_struct *work)
 	} else {
 		dev_notice(dev_priv->drm.dev,
 			   "Failed to load DMC firmware"
-			   " [" FIRMWARE_URL "],"
-			   " disabling runtime power management.\n");
+			   " [" FIRMWARE_URL "]");
 	}
 
+	intel_display_power_put(dev_priv, POWER_DOMAIN_INIT);
+
 	release_firmware(fw);
 }
 
-- 
2.7.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2017-08-19  1:00 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-14 17:12 [PATCH] drm/i915: decouple runtime PM enablement from DMC presence matthew.s.atwood
2017-06-14 17:33 ` Imre Deak
2017-06-14 17:40   ` Atwood, Matthew S
2017-06-14 17:55     ` Imre Deak
2017-06-14 20:02       ` Rodrigo Vivi
2017-06-14 20:07         ` Atwood, Matthew S
2017-06-14 20:17         ` Imre Deak
2017-06-15 16:16           ` Atwood, Matthew S
2017-06-15 16:30             ` Imre Deak
2017-06-15 17:20               ` Rodrigo Vivi
2017-06-15 17:38                 ` Imre Deak
2017-06-19 18:45                   ` Jani Nikula
2017-08-18  1:00                     ` Stéphane Marchesin
2017-08-18  9:07                       ` Jani Nikula
2017-08-18 14:26                         ` Tahvanainen, Jari
2017-08-18 14:35                           ` Chris Wilson
2017-08-19  1:00                         ` Stéphane Marchesin
2017-06-14 17:40 ` ✗ Fi.CI.BAT: failure for " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox