Skip to contentSkip to conversation

drm/i915/dp: set sink to power down mode on dp disable

PATCH In review Jani Nikula 3 participants 4 messages Nov 12, 2013 – Nov 13, 2013

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

PATCH 1/1 drm/i915/dp: set sink to power down mode on dp disable

We used to put the local sink and any downstream sinks to power down mode at disable or dpms off using the DPCD SET_POWER register, until this was broken by

commit e8cb455876fa8f67c6aba394d0a14b697bf04cc3

Author: Daniel Vetter <[email protected]>
Date:   Sun Jul 1 13:05:48 2012 +0200

drm/i915/dp: convert to encoder disable/enable

Fix it.

---
 drivers/gpu/drm/i915/intel_dp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +1 -1
index dbe4840..cbf33be 100644
@@ -1774,7 +1774,7 @@ static void intel_disable_dp(struct intel_encoder *encoder)
 	 * ensure that we have vdd while we switch off the panel. */
 	ironlake_edp_panel_vdd_on(intel_dp);
 	ironlake_edp_backlight_off(intel_dp);
-	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
+	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
 	ironlake_edp_panel_off(intel_dp);
 
 	/* cpu edp my only be disable _after_ the cpu pipe/plane is disabled. */
Signature · 1 line
1.7.9.5
Reviewed-by on v1 1/1
#1 lore raw
Quoted 22 lines · Jani Nikula

We used to put the local sink and any downstream sinks to power down mode at disable or dpms off using the DPCD SET_POWER register, until this was broken by

commit e8cb455876fa8f67c6aba394d0a14b697bf04cc3

Author: Daniel Vetter <[email protected]>
Date:   Sun Jul 1 13:05:48 2012 +0200

drm/i915/dp: convert to encoder disable/enable

Fix it.

---
  drivers/gpu/drm/i915/intel_dp.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +0 -0
index dbe4840..cbf33be 100644

drivers/gpu/drm/i915/intel_dp.c static void intel_disable_dp(struct intel_encoder *encoder) · line 1780

Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -1774,7 +1774,7 @@ static void intel_disable_dp(struct intel_encoder *encoder)
  	 * ensure that we have vdd while we switch off the panel. */
  	ironlake_edp_panel_vdd_on(intel_dp);
  	ironlake_edp_backlight_off(intel_dp);
-	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
+	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
  	ironlake_edp_panel_off(intel_dp);
 
  	/* cpu edp my only be disable _after_ the cpu pipe/plane is disabled. */
#2 lore raw
Quoted 30 lines · Todd Previte
Quoted 29 lines · Jani Nikula

We used to put the local sink and any downstream sinks to power down mode at disable or dpms off using the DPCD SET_POWER register, until this was broken by

commit e8cb455876fa8f67c6aba394d0a14b697bf04cc3

Author: Daniel Vetter <[email protected]>
Date:   Sun Jul 1 13:05:48 2012 +0200

drm/i915/dp: convert to encoder disable/enable

Fix it.

---
 drivers/gpu/drm/i915/intel_dp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +1 -1
index dbe4840..cbf33be 100644
@@ -1774,7 +1774,7 @@ static void intel_disable_dp(struct intel_encoder *encoder)
 	 * ensure that we have vdd while we switch off the panel. */
 	ironlake_edp_panel_vdd_on(intel_dp);
 	ironlake_edp_backlight_off(intel_dp);
-	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
+	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
 	ironlake_edp_panel_off(intel_dp);
 
Quoted 3 lines

drivers/gpu/drm/i915/intel_dp.c static void intel_disable_dp(struct intel_encoder *encoder) · line 1780

Quoted 1 line
drivers/gpu/drm/i915/intel_dp.c +0 -0
 	/* cpu edp my only be disable _after_ the cpu pipe/plane is disabled. */

Picked up for -fixes, thanks for the patch. Atm without a cc: stable, but I'll add that if we get a tested-by from a bug report. Might be worth a shot to haggle this by some dp bugzillas ...
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#3 lore raw
Quoted 31 lines · Daniel Vetter
Quoted 30 lines · Todd Previte
Quoted 29 lines · Jani Nikula

We used to put the local sink and any downstream sinks to power down mode at disable or dpms off using the DPCD SET_POWER register, until this was broken by

commit e8cb455876fa8f67c6aba394d0a14b697bf04cc3

Author: Daniel Vetter <[email protected]>
Date:   Sun Jul 1 13:05:48 2012 +0200

drm/i915/dp: convert to encoder disable/enable

Fix it.

---
 drivers/gpu/drm/i915/intel_dp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +1 -1
index dbe4840..cbf33be 100644
@@ -1774,7 +1774,7 @@ static void intel_disable_dp(struct intel_encoder *encoder)
 	 * ensure that we have vdd while we switch off the panel. */
 	ironlake_edp_panel_vdd_on(intel_dp);
 	ironlake_edp_backlight_off(intel_dp);
-	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
+	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
 	ironlake_edp_panel_off(intel_dp);
 
Quoted 7 lines
Quoted 3 lines

drivers/gpu/drm/i915/intel_dp.c static void intel_disable_dp(struct intel_encoder *encoder) · line 1780

Quoted 1 line
drivers/gpu/drm/i915/intel_dp.c +0 -0
 	/* cpu edp my only be disable _after_ the cpu pipe/plane is disabled. */

Picked up for -fixes, thanks for the patch. Atm without a cc: stable, but I'll add that if we get a tested-by from a bug report. Might be worth a shot to haggle this by some dp bugzillas ...

I'm really not sure what the impact might be other than a potential power regression fix, and I presume a smart sink would save power when we put the main link down. The DP spec is a bit light on this. For eDP we cut the power anyway, so perhaps the impact is on external displays only, and people might not even pay so much attention to their power consumption.

I guess I could have put that in the commit message too, but oh well.

BR,
Jani.

Signature · 1 line
Jani Nikula, Intel Open Source Technology Center