Skip to contentSkip to conversation

drm/i915: allow requesting the audio power well for all platforms

PATCH In review Imre Deak 3 participants 5 messages Dec 5, 2014 – Jan 26, 2015

Subsystems (2)
lore
Share & tools
lore

Imre Deak

author
#0 lore raw

PATCH 1/1 drm/i915: allow requesting the audio power well for all platforms

So far we only allowed HSW and BDW to request for the audio power domain, but it is also needed at least on VLV/CHV. There is no need for this restriction, since the power domain->power well mapping should take care of the distinctions between platforms.

---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_runtime_pm.c +10 -10
index 8a2bd18..58204ab 100644
@@ -50,7 +50,7 @@
  * present for a given platform.
  */
 
-static struct i915_power_domains *hsw_pwr;
+static struct i915_power_domains *i915_pwr;
 
 #define for_each_power_well(i, power_well, domain_mask, power_domains)	\
 	for (i = 0;							\
@@ -1098,10 +1098,8 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
 	 */
 	if (IS_HASWELL(dev_priv->dev)) {
 		set_power_wells(power_domains, hsw_power_wells);
-		hsw_pwr = power_domains;
 	} else if (IS_BROADWELL(dev_priv->dev)) {
 		set_power_wells(power_domains, bdw_power_wells);
-		hsw_pwr = power_domains;
 	} else if (IS_CHERRYVIEW(dev_priv->dev)) {
 		set_power_wells(power_domains, chv_power_wells);
 	} else if (IS_VALLEYVIEW(dev_priv->dev)) {
@@ -1110,6 +1108,8 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
 		set_power_wells(power_domains, i9xx_always_on_power_well);
 	}
 
+	i915_pwr = power_domains;
+
 	return 0;
 }
 
@@ -1146,7 +1146,7 @@ void intel_power_domains_fini(struct drm_i915_private *dev_priv)
 	 * we're going to unload/reload. */
 	intel_display_set_init_power(dev_priv, true);
 
-	hsw_pwr = NULL;
+	i915_pwr = NULL;
 }
 
 static void intel_power_domains_resume(struct drm_i915_private *dev_priv)
@@ -1360,10 +1360,10 @@ int i915_request_power_well(void)
 {
 	struct drm_i915_private *dev_priv;
 
-	if (!hsw_pwr)
+	if (!i915_pwr)
 		return -ENODEV;
 
-	dev_priv = container_of(hsw_pwr, struct drm_i915_private,
+	dev_priv = container_of(i915_pwr, struct drm_i915_private,
 				power_domains);
 	intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
 	return 0;
@@ -1375,10 +1375,10 @@ int i915_release_power_well(void)
 {
 	struct drm_i915_private *dev_priv;
 
-	if (!hsw_pwr)
+	if (!i915_pwr)
 		return -ENODEV;
 
-	dev_priv = container_of(hsw_pwr, struct drm_i915_private,
+	dev_priv = container_of(i915_pwr, struct drm_i915_private,
 				power_domains);
 	intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
 	return 0;
@@ -1395,10 +1395,10 @@ int i915_get_cdclk_freq(void)
 {
 	struct drm_i915_private *dev_priv;
 
-	if (!hsw_pwr)
+	if (!i915_pwr)
 		return -ENODEV;
 
-	dev_priv = container_of(hsw_pwr, struct drm_i915_private,
+	dev_priv = container_of(i915_pwr, struct drm_i915_private,
 				power_domains);
 
 	return intel_ddi_get_cdclk_freq(dev_priv);
Signature · 6 lines
1.8.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#1 lore raw
Quoted 80 lines · Imre Deak

So far we only allowed HSW and BDW to request for the audio power domain, but it is also needed at least on VLV/CHV. There is no need for this restriction, since the power domain->power well mapping should take care of the distinctions between platforms.

---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_runtime_pm.c +8 -8
index 8a2bd18..58204ab 100644
@@ -50,7 +50,7 @@
  * present for a given platform.
  */
 
-static struct i915_power_domains *hsw_pwr;
+static struct i915_power_domains *i915_pwr;
 
 #define for_each_power_well(i, power_well, domain_mask, power_domains)	\
 	for (i = 0;							\
@@ -1098,10 +1098,8 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
 	 */
 	if (IS_HASWELL(dev_priv->dev)) {
 		set_power_wells(power_domains, hsw_power_wells);
-		hsw_pwr = power_domains;
 	} else if (IS_BROADWELL(dev_priv->dev)) {
 		set_power_wells(power_domains, bdw_power_wells);
-		hsw_pwr = power_domains;
 	} else if (IS_CHERRYVIEW(dev_priv->dev)) {
 		set_power_wells(power_domains, chv_power_wells);
 	} else if (IS_VALLEYVIEW(dev_priv->dev)) {
@@ -1110,6 +1108,8 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
 		set_power_wells(power_domains, i9xx_always_on_power_well);
 	}
 
+	i915_pwr = power_domains;
+
 	return 0;
 }
 
@@ -1146,7 +1146,7 @@ void intel_power_domains_fini(struct drm_i915_private *dev_priv)
 	 * we're going to unload/reload. */
 	intel_display_set_init_power(dev_priv, true);
 
-	hsw_pwr = NULL;
+	i915_pwr = NULL;
 }
 
 static void intel_power_domains_resume(struct drm_i915_private *dev_priv)
@@ -1360,10 +1360,10 @@ int i915_request_power_well(void)
 {
 	struct drm_i915_private *dev_priv;
 
-	if (!hsw_pwr)
+	if (!i915_pwr)
 		return -ENODEV;
 
-	dev_priv = container_of(hsw_pwr, struct drm_i915_private,
+	dev_priv = container_of(i915_pwr, struct drm_i915_private,
 				power_domains);
 	intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
 	return 0;
@@ -1375,10 +1375,10 @@ int i915_release_power_well(void)
 {
 	struct drm_i915_private *dev_priv;
 
-	if (!hsw_pwr)
+	if (!i915_pwr)
 		return -ENODEV;
 
-	dev_priv = container_of(hsw_pwr, struct drm_i915_private,
+	dev_priv = container_of(i915_pwr, struct drm_i915_private,
 				power_domains);
 	intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
 	return 0;

drivers/gpu/drm/i915/intel_runtime_pm.c int i915_get_cdclk_freq(void) · line 1399

Quoted 6 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -1
@@ -1395,10 +1395,10 @@ int i915_get_cdclk_freq(void)
 {
 	struct drm_i915_private *dev_priv;
 
-	if (!hsw_pwr)
+	if (!i915_pwr)
 		return -ENODEV;

Err, we should also WARN and return here for !HAS_DDI. This is used for restoring the audio BCLK M/N values in the HSW/BDW extended mode registers, but there is no corresponding registers on other platforms.

drivers/gpu/drm/i915/intel_runtime_pm.c int i915_get_cdclk_freq(void) · line 1404

Quoted 6 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -1
-	dev_priv = container_of(hsw_pwr, struct drm_i915_private,
+	dev_priv = container_of(i915_pwr, struct drm_i915_private,
 				power_domains);
 
 	return intel_ddi_get_cdclk_freq(dev_priv);

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 84 lines · Imre Deak
Quoted 83 lines · Imre Deak

So far we only allowed HSW and BDW to request for the audio power domain, but it is also needed at least on VLV/CHV. There is no need for this restriction, since the power domain->power well mapping should take care of the distinctions between platforms.

---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_runtime_pm.c +8 -8
index 8a2bd18..58204ab 100644
@@ -50,7 +50,7 @@
  * present for a given platform.
  */
 
-static struct i915_power_domains *hsw_pwr;
+static struct i915_power_domains *i915_pwr;
 
 #define for_each_power_well(i, power_well, domain_mask, power_domains)       \
      for (i = 0;                                                     \
@@ -1098,10 +1098,8 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
       */
      if (IS_HASWELL(dev_priv->dev)) {
              set_power_wells(power_domains, hsw_power_wells);
-             hsw_pwr = power_domains;
      } else if (IS_BROADWELL(dev_priv->dev)) {
              set_power_wells(power_domains, bdw_power_wells);
-             hsw_pwr = power_domains;
      } else if (IS_CHERRYVIEW(dev_priv->dev)) {
              set_power_wells(power_domains, chv_power_wells);
      } else if (IS_VALLEYVIEW(dev_priv->dev)) {
@@ -1110,6 +1108,8 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
              set_power_wells(power_domains, i9xx_always_on_power_well);
      }
 
+     i915_pwr = power_domains;
+
      return 0;
 }
 
@@ -1146,7 +1146,7 @@ void intel_power_domains_fini(struct drm_i915_private *dev_priv)
       * we're going to unload/reload. */
      intel_display_set_init_power(dev_priv, true);
 
-     hsw_pwr = NULL;
+     i915_pwr = NULL;
 }
 
 static void intel_power_domains_resume(struct drm_i915_private *dev_priv)
@@ -1360,10 +1360,10 @@ int i915_request_power_well(void)
 {
      struct drm_i915_private *dev_priv;
 
-     if (!hsw_pwr)
+     if (!i915_pwr)
              return -ENODEV;
 
-     dev_priv = container_of(hsw_pwr, struct drm_i915_private,
+     dev_priv = container_of(i915_pwr, struct drm_i915_private,
                              power_domains);
      intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
      return 0;
@@ -1375,10 +1375,10 @@ int i915_release_power_well(void)
 {
      struct drm_i915_private *dev_priv;
 
-     if (!hsw_pwr)
+     if (!i915_pwr)
              return -ENODEV;
 
-     dev_priv = container_of(hsw_pwr, struct drm_i915_private,
+     dev_priv = container_of(i915_pwr, struct drm_i915_private,
                              power_domains);
      intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
      return 0;
@@ -1395,10 +1395,10 @@ int i915_get_cdclk_freq(void)
 {
      struct drm_i915_private *dev_priv;
 
Quoted 7 lines

drivers/gpu/drm/i915/intel_runtime_pm.c int i915_request_power_well(void) · line 1364

Quoted 3 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -1
-     if (!hsw_pwr)
+     if (!i915_pwr)
              return -ENODEV;

Err, we should also WARN and return here for !HAS_DDI. This is used for restoring the audio BCLK M/N values in the HSW/BDW extended mode registers, but there is no corresponding registers on other platforms.

I was getting this patch for collector but this comment confused me. Should we expect a v2 or get this?

Quoted 13 lines

drivers/gpu/drm/i915/intel_runtime_pm.c int i915_get_cdclk_freq(void) · line 1404

Quoted 7 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -1
-     dev_priv = container_of(hsw_pwr, struct drm_i915_private,
+     dev_priv = container_of(i915_pwr, struct drm_i915_private,
                              power_domains);
 
      return intel_ddi_get_cdclk_freq(dev_priv);

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 6 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#3 lore raw
Quoted 93 lines · Rodrigo Vivi
Quoted 84 lines · Imre Deak
Quoted 83 lines · Imre Deak

So far we only allowed HSW and BDW to request for the audio power domain, but it is also needed at least on VLV/CHV. There is no need for this restriction, since the power domain->power well mapping should take care of the distinctions between platforms.

---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_runtime_pm.c +8 -8
index 8a2bd18..58204ab 100644
@@ -50,7 +50,7 @@
  * present for a given platform.
  */
 
-static struct i915_power_domains *hsw_pwr;
+static struct i915_power_domains *i915_pwr;
 
 #define for_each_power_well(i, power_well, domain_mask, power_domains)       \
      for (i = 0;                                                     \
@@ -1098,10 +1098,8 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
       */
      if (IS_HASWELL(dev_priv->dev)) {
              set_power_wells(power_domains, hsw_power_wells);
-             hsw_pwr = power_domains;
      } else if (IS_BROADWELL(dev_priv->dev)) {
              set_power_wells(power_domains, bdw_power_wells);
-             hsw_pwr = power_domains;
      } else if (IS_CHERRYVIEW(dev_priv->dev)) {
              set_power_wells(power_domains, chv_power_wells);
      } else if (IS_VALLEYVIEW(dev_priv->dev)) {
@@ -1110,6 +1108,8 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
              set_power_wells(power_domains, i9xx_always_on_power_well);
      }
 
+     i915_pwr = power_domains;
+
      return 0;
 }
 
@@ -1146,7 +1146,7 @@ void intel_power_domains_fini(struct drm_i915_private *dev_priv)
       * we're going to unload/reload. */
      intel_display_set_init_power(dev_priv, true);
 
-     hsw_pwr = NULL;
+     i915_pwr = NULL;
 }
 
 static void intel_power_domains_resume(struct drm_i915_private *dev_priv)
@@ -1360,10 +1360,10 @@ int i915_request_power_well(void)
 {
      struct drm_i915_private *dev_priv;
 
-     if (!hsw_pwr)
+     if (!i915_pwr)
              return -ENODEV;
 
-     dev_priv = container_of(hsw_pwr, struct drm_i915_private,
+     dev_priv = container_of(i915_pwr, struct drm_i915_private,
                              power_domains);
      intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
      return 0;
@@ -1375,10 +1375,10 @@ int i915_release_power_well(void)
 {
      struct drm_i915_private *dev_priv;
 
-     if (!hsw_pwr)
+     if (!i915_pwr)
              return -ENODEV;
 
-     dev_priv = container_of(hsw_pwr, struct drm_i915_private,
+     dev_priv = container_of(i915_pwr, struct drm_i915_private,
                              power_domains);
      intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
      return 0;
@@ -1395,10 +1395,10 @@ int i915_get_cdclk_freq(void)
 {
      struct drm_i915_private *dev_priv;
 
Quoted 7 lines

drivers/gpu/drm/i915/intel_runtime_pm.c int i915_request_power_well(void) · line 1364

Quoted 3 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -1
-     if (!hsw_pwr)
+     if (!i915_pwr)
              return -ENODEV;

Err, we should also WARN and return here for !HAS_DDI. This is used for restoring the audio BCLK M/N values in the HSW/BDW extended mode registers, but there is no corresponding registers on other platforms.

Quoted 2 lines

I was getting this patch for collector but this comment confused me. Should we expect a v2 or get this?

Rodrigo, this patch can be ignored, since we have already the audio component code merged. That one solves this problem too.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -1
-     dev_priv = container_of(hsw_pwr, struct drm_i915_private,
+     dev_priv = container_of(i915_pwr, struct drm_i915_private,
                              power_domains);
 
Quoted 10 lines
Quoted 7 lines

drivers/gpu/drm/i915/intel_runtime_pm.c int i915_get_cdclk_freq(void) · line 1404

Quoted 1 line
drivers/gpu/drm/i915/intel_runtime_pm.c +0 -0
      return intel_ddi_get_cdclk_freq(dev_priv);

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Tested-by on v1 1/1
#4 lore raw
In reply to Imre Deak

-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 364/364 364/364

ILK                 -2              366/366              364/366
SNB                 -1              450/450              449/450
IVB              +17                 481/498              498/498
BYT                                  289/289              289/289

HSW -1 564/564 563/564
BDW 417/417 417/417
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied

*ILK  igt_kms_flip_rcs-wf_vblank-vs-dpms-interruptible      DMESG_WARN(1, M26)PASS(3, M37M26)      NSPT(1, M26)
*ILK  igt_kms_flip_wf_vblank-vs-modeset-interruptible      PASS(2, M37M26)      DMESG_WARN(1, M26)
 SNB  igt_kms_force_connector      NRUN(3, M35M22)PASS(1, M35)      NRUN(1, M22)
 IVB  igt_kms_3d      DMESG_WARN(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_cursor_crc_cursor-128x128-onscreen      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_cursor_crc_cursor-128x128-random      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_cursor_crc_cursor-128x128-sliding      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_cursor_crc_cursor-256x256-offscreen      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_cursor_crc_cursor-256x256-onscreen      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_cursor_crc_cursor-256x256-sliding      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_cursor_crc_cursor-64x64-offscreen      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_cursor_crc_cursor-64x64-onscreen      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_cursor_crc_cursor-64x64-random      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_cursor_crc_cursor-64x64-sliding      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_cursor_crc_cursor-size-change      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_fence_pin_leak      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_mmio_vs_cs_flip_setcrtc_vs_cs_flip      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_mmio_vs_cs_flip_setplane_vs_cs_flip      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_rotation_crc_primary-rotation      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 IVB  igt_kms_rotation_crc_sprite-rotation      NSPT(1, M34)PASS(13, M4M34M21)      PASS(1, M21)
 HSW  igt_kms_force_connector      NRUN(3, M40M19M20)PASS(1, M40)      NRUN(1, M19)

Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx