Skip to contentSkip to conversation

drm/i915: Fix PSR programming

PATCH In review Ben Widawsky 2 participants 3 messages Mar 5, 2014 – Mar 6, 2014

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

PATCH 1/1 drm/i915: Fix PSR programming

| has a higher precedence than ?. Therefore, the calculation doesn't do at all what you would expect. Thanks to Ken for convincing me that this was indeed the issue. Send me back to C programmer school, please.

I'm sort of surprised PSR was continuing to work for people. It should be broken IMO (and it was broken for me, but I had assumed it never worked).

Regression from:
commit ed8546ac1f99b850879f07b1e9b06b42fb0a36d9

Author: Ben Widawsky <[email protected]>
Date:   Mon Nov 4 22:45:05 2013 -0800

drm/i915/bdw: Support eDP PSR

I am pretty certain PSR is disabled by default, so no CC stable.

---
 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 c512d78..2c0ceb4 100644
@@ -1723,7 +1723,7 @@ static void intel_edp_psr_enable_source(struct intel_dp *intel_dp)
 		val |= EDP_PSR_LINK_DISABLE;
 
 	I915_WRITE(EDP_PSR_CTL(dev), val |
-		   IS_BROADWELL(dev) ? 0 : link_entry_time |
+		   (IS_BROADWELL(dev) ? 0 : link_entry_time) |
 		   max_sleep_time << EDP_PSR_MAX_SLEEP_TIME_SHIFT |
 		   idle_frames << EDP_PSR_IDLE_FRAME_SHIFT |
 		   EDP_PSR_ENABLE);
Signature · 1 line
1.9.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Ben Widawsky

| has a higher precedence than ?. Therefore, the calculation doesn't do at all what you would expect. Thanks to Ken for convincing me that this was indeed the issue. Send me back to C programmer school, please.

I'm sort of surprised PSR was continuing to work for people. It should be broken IMO (and it was broken for me, but I had assumed it never worked).

Quoted 8 lines

Regression from:
commit ed8546ac1f99b850879f07b1e9b06b42fb0a36d9

Author: Ben Widawsky <[email protected]>
Date:   Mon Nov 4 22:45:05 2013 -0800

drm/i915/bdw: Support eDP PSR

I am pretty certain PSR is disabled by default, so no CC stable.

I think I'll pick this up for -fixes, with CC stable, as it also breaks Haswell PSR.

Quoted 29 lines
---
 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 c512d78..2c0ceb4 100644
@@ -1723,7 +1723,7 @@ static void intel_edp_psr_enable_source(struct intel_dp *intel_dp)
 		val |= EDP_PSR_LINK_DISABLE;
 
 	I915_WRITE(EDP_PSR_CTL(dev), val |
-		   IS_BROADWELL(dev) ? 0 : link_entry_time |
+		   (IS_BROADWELL(dev) ? 0 : link_entry_time) |
 		   max_sleep_time << EDP_PSR_MAX_SLEEP_TIME_SHIFT |
 		   idle_frames << EDP_PSR_IDLE_FRAME_SHIFT |
 		   EDP_PSR_ENABLE);
Signature · 6 lines
1.9.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
maintainer
#2 lore raw
Quoted 14 lines · Jani Nikula
Quoted 13 lines · Ben Widawsky

| has a higher precedence than ?. Therefore, the calculation doesn't do at all what you would expect. Thanks to Ken for convincing me that this was indeed the issue. Send me back to C programmer school, please.

I'm sort of surprised PSR was continuing to work for people. It should be broken IMO (and it was broken for me, but I had assumed it never worked).

Regression from:
commit ed8546ac1f99b850879f07b1e9b06b42fb0a36d9

Author: Ben Widawsky <[email protected]>
Date:   Mon Nov 4 22:45:05 2013 -0800
Quoted 6 lines
Quoted 3 lines

drm/i915/bdw: Support eDP PSR

I am pretty certain PSR is disabled by default, so no CC stable.

I think I'll pick this up for -fixes, with CC stable, as it also breaks Haswell PSR.

Actually pushed now too, thanks for the patch.

BR,
Jani.

Quoted 39 lines
Quoted 29 lines
---
 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 c512d78..2c0ceb4 100644
@@ -1723,7 +1723,7 @@ static void intel_edp_psr_enable_source(struct intel_dp *intel_dp)
 		val |= EDP_PSR_LINK_DISABLE;
 
 	I915_WRITE(EDP_PSR_CTL(dev), val |
-		   IS_BROADWELL(dev) ? 0 : link_entry_time |
+		   (IS_BROADWELL(dev) ? 0 : link_entry_time) |
 		   max_sleep_time << EDP_PSR_MAX_SLEEP_TIME_SHIFT |
 		   idle_frames << EDP_PSR_IDLE_FRAME_SHIFT |
 		   EDP_PSR_ENABLE);
Signature · 6 lines
1.9.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center