drm/i915/psr: fix blank screen issue for psr2
Subsystems (2)
PATCH 3/10 drm/i915/psr: fix blank screen issue for psr2
Psr1 and psr2 are mutually exclusive,ie when psr2 is enabled, psr1 should be disabled.When psr2 is exited , bit 31 of reg PSR2_CTL must be set to 0 but currently bit 31 of SRD_CTL (psr1 control register)is set to 0.
Also ,PSR2_IDLE state is looked up from SRD_STATUS(psr1 register) instead of PSR2_STATUS register, which has wrong data, resulting in blankscreen.hsw_enable_source is split into hsw_enable_source_psr1 and hsw_enable_source_psr2 for easier code review and maintenance, as suggested by rodrigo and jim.
v2: (Vivi Rodrigo)
- Rename hsw_enable_source_psr* to intel_enable_source_psr*
--- drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/intel_psr.c | 124 +++++++++++++++++++++++++++++---------- 2 files changed, 97 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -3615,6 +3615,9 @@ enum {#define EDP_PSR2_FRAME_BEFORE_SU_MASK (0xf<<4)#define EDP_PSR2_IDLE_MASK 0xf +#define EDP_PSR2_STATUS_CTL _MMIO(0x6f940) +#define EDP_PSR2_STATUS_STATE_MASK (0xf<<28) +/* VGA port control */ #define ADPA _MMIO(0x61100)#define PCH_ADPA _MMIO(0xe1100)
drivers/gpu/drm/i915/intel_psr.c +94 -30
193 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · vathsala nagaraju
Psr1 and psr2 are mutually exclusive,ie when psr2 is enabled, psr1 should be disabled.When psr2 is exited , bit 31 of reg
PSR2_CTLmust be set to 0 but currently bit 31 ofSRD_CTL(psr1 control register)is set to 0.
Also ,PSR2_IDLE state is looked up fromSRD_STATUS(psr1 register)instead ofPSR2_STATUSregister, which has wrong data, resulting in blankscreen.hsw_enable_sourceis split intohsw_enable_source_psr1andhsw_enable_source_psr2for easier code review and maintenance, as suggested by rodrigo and jim.
Quoted 7 lines
v2: (Vivi Rodrigo)
- Rename hsw_enable_source_psr* to intel_enable_source_psr*Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by Vathsala Nagaraju <[email protected]>Signed-off-by Patil Deepti <[email protected]>
The new naming is much better!
Quoted 227 lines
--- drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/intel_psr.c | 124 +++++++++++++++++++++++++++++---------- 2 files changed, 97 insertions(+), 30 deletions(-)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -3615,6 +3615,9 @@ enum {#define EDP_PSR2_FRAME_BEFORE_SU_MASK (0xf<<4)#define EDP_PSR2_IDLE_MASK 0xf +#define EDP_PSR2_STATUS_CTL _MMIO(0x6f940) +#define EDP_PSR2_STATUS_STATE_MASK (0xf<<28) +/* VGA port control */ #define ADPA _MMIO(0x61100)#define PCH_ADPA _MMIO(0xe1100)drivers/gpu/drm/i915/intel_psr.c +94
-30@@ -261,12 +261,11 @@ static void vlv_psr_activate(struct intel_dp *intel_dp) VLV_EDP_PSR_ACTIVE_ENTRY); } -static void hsw_psr_enable_source (struct intel_dp *intel_dp) +static void intel_enable_source_psr1 (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -uint32_t max_sleep_time =0x1f ;/* * Let's respect VBT in case VBT asks a higher idle_frame value. @@ -312,14 +311,30 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) val |=EDP_PSR_TP1_TP2_SEL ;I915_WRITE (EDP_PSR_CTL , val); +} -if (!dev_priv->psr.psr2_support) -return ; +static void intel_enable_source_psr2 (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); + +/* +* Let's respect VBT in case VBT asks a higher idle_frame value. +* Let's use 6 as the minimum to cover all known cases including +* the off-by-one issue that HW has in some cases. Also there are +* cases where sink should be able to train +* with the 5 or 6 idle patterns. +*/ +uint32_t idle_frames =max (6 , dev_priv->vbt.psr.idle_frames); +uint32_t val =EDP_PSR_ENABLE ; + + val |= idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT ;/* FIXME: selective update is probably totally broken because it doesn't * mesh at all with our frontbuffer tracking. And the hw alone isn't * good enough. */ - val =EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE ; + val |=EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE ;if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >5 ) val |=EDP_PSR2_TP2_TIME_2500 ;@@ -333,6 +348,20 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp)I915_WRITE (EDP_PSR2_CTL , val); } + +static void hsw_psr_enable_source (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); + +/* psr1 and psr2 are mutually exclusive.*/ +if (dev_priv->psr.psr2_support) +intel_enable_source_psr2 (intel_dp); +else +intel_enable_source_psr1 (intel_dp); +} +static bool intel_psr_match_conditions (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);@@ -410,7 +439,10 @@ static void intel_psr_activate(struct intel_dp *intel_dp)struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ); +else +WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE );WARN_ON (dev_priv->psr.active);lockdep_assert_held (&dev_priv->psr.lock);@@ -462,8 +494,6 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.busy_frontbuffer_bits =0 ;if (HAS_DDI (dev_priv)) { -hsw_psr_setup_vsc (intel_dp); -if (dev_priv->psr.psr2_support) {/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ if (crtc->config->pipe_src_w > 3200 ||@@ -471,8 +501,10 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = false; elseskl_psr_setup_su_vsc (intel_dp ); + }else { +/* set up vsc header for psr1 */ +hsw_psr_setup_vsc (intel_dp); } -/* * Per Spec: Avoid continuous PSR exit by masking MEMUP and HPD. * Also mask LPSP to avoid dependency on other drivers that @@ -557,20 +589,37 @@ static void hsw_psr_disable(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv =to_i915 (dev);if (dev_priv->psr.active) { -I915_WRITE (EDP_PSR_CTL , -I915_READ (EDP_PSR_CTL ) & ~EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +I915_WRITE (EDP_PSR2_CTL , +I915_READ (EDP_PSR2_CTL ) & + ~(EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE )); +else +I915_WRITE (EDP_PSR_CTL , +I915_READ (EDP_PSR_CTL ) & ~EDP_PSR_ENABLE );/* Wait till PSR is idle */ -if (intel_wait_for_register (dev_priv, -EDP_PSR_STATUS_CTL , -EDP_PSR_STATUS_STATE_MASK , -0 , -2000 )) +if (dev_priv->psr.psr2_support) { +if (intel_wait_for_register (dev_priv, +EDP_PSR2_STATUS_CTL , +EDP_PSR2_STATUS_STATE_MASK , +0 , +2000 )) +DRM_ERROR ("Timed out waiting for PSR2 Idle State\n" ); + }else { +if (intel_wait_for_register (dev_priv, +EDP_PSR_STATUS_CTL , +EDP_PSR_STATUS_STATE_MASK , +0 , +2000 ))DRM_ERROR ("Timed out waiting for PSR Idle State\n" ); - + } dev_priv->psr.active = false; }else { -WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ); +else +WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } }@@ -621,13 +670,24 @@ static void intel_psr_work(struct work_struct *work)* and be ready for re-enable. */ if (HAS_DDI (dev_priv)) { -if (intel_wait_for_register (dev_priv, -EDP_PSR_STATUS_CTL , -EDP_PSR_STATUS_STATE_MASK , -0 , -50 )) { -DRM_ERROR ("Timed out waiting for PSR Idle for re-enable\n" ); -return ; +if (dev_priv->psr.psr2_support) { +if (intel_wait_for_register (dev_priv, +EDP_PSR2_STATUS_CTL , +EDP_PSR2_STATUS_STATE_MASK , +0 , +50 )) { +DRM_ERROR ("Timed out waiting for PSR2 Idle for re-enable\n" ); +return ; + } + }else { +if (intel_wait_for_register (dev_priv, +EDP_PSR_STATUS_CTL , +EDP_PSR_STATUS_STATE_MASK , +0 , +50 )) { +DRM_ERROR ("Timed out waiting for PSR Idle for re-enable\n" ); +return ; + } } }else { if (intel_wait_for_register(dev_priv,@@ -669,11 +729,15 @@ static void intel_psr_exit(struct drm_i915_private *dev_priv)return ;if (HAS_DDI (dev_priv)) { - val =I915_READ (EDP_PSR_CTL ); - -WARN_ON (!(val &EDP_PSR_ENABLE )); - -I915_WRITE (EDP_PSR_CTL , val & ~EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) { + val =I915_READ (EDP_PSR2_CTL ); +WARN_ON (!(val &EDP_PSR2_ENABLE )); +I915_WRITE (EDP_PSR2_CTL , val & ~EDP_PSR2_ENABLE ); + }else { + val =I915_READ (EDP_PSR_CTL ); +WARN_ON (!(val &EDP_PSR_ENABLE )); +I915_WRITE (EDP_PSR_CTL , val & ~EDP_PSR_ENABLE ); + } }else { val =I915_READ (VLV_PSRCTL (pipe));Signature · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerQuoted 132 lines · vathsala nagaraju
Psr1 and psr2 are mutually exclusive,ie when psr2 is enabled, psr1 should be disabled.When psr2 is exited , bit 31 of reg
PSR2_CTLmust be set to 0 but currently bit 31 ofSRD_CTL(psr1 control register)is set to 0.
Also ,PSR2_IDLE state is looked up fromSRD_STATUS(psr1 register)instead ofPSR2_STATUSregister, which has wrong data, resulting in blankscreen.hsw_enable_sourceis split intohsw_enable_source_psr1andhsw_enable_source_psr2for easier code review and maintenance, as suggested by rodrigo and jim.v2: (Vivi Rodrigo)
- Rename hsw_enable_source_psr* to intel_enable_source_psr*Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by Vathsala Nagaraju <[email protected]>Signed-off-by Patil Deepti <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/intel_psr.c | 124 +++++++++++++++++++++++++++++---------- 2 files changed, 97 insertions(+), 30 deletions(-)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -3615,6 +3615,9 @@ enum {#define EDP_PSR2_FRAME_BEFORE_SU_MASK (0xf<<4)#define EDP_PSR2_IDLE_MASK 0xf +#define EDP_PSR2_STATUS_CTL _MMIO(0x6f940) +#define EDP_PSR2_STATUS_STATE_MASK (0xf<<28) +/* VGA port control */ #define ADPA _MMIO(0x61100)#define PCH_ADPA _MMIO(0xe1100)drivers/gpu/drm/i915/intel_psr.c +38
-8@@ -261,12 +261,11 @@ static void vlv_psr_activate(struct intel_dp *intel_dp) VLV_EDP_PSR_ACTIVE_ENTRY); } -static void hsw_psr_enable_source (struct intel_dp *intel_dp) +static void intel_enable_source_psr1 (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -uint32_t max_sleep_time =0x1f ;/* * Let's respect VBT in case VBT asks a higher idle_frame value. @@ -312,14 +311,30 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) val |=EDP_PSR_TP1_TP2_SEL ;I915_WRITE (EDP_PSR_CTL , val); +} -if (!dev_priv->psr.psr2_support) -return ; +static void intel_enable_source_psr2 (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); + +/* +* Let's respect VBT in case VBT asks a higher idle_frame value. +* Let's use 6 as the minimum to cover all known cases including +* the off-by-one issue that HW has in some cases. Also there are +* cases where sink should be able to train +* with the 5 or 6 idle patterns. +*/ +uint32_t idle_frames =max (6 , dev_priv->vbt.psr.idle_frames); +uint32_t val =EDP_PSR_ENABLE ; + + val |= idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT ;/* FIXME: selective update is probably totally broken because it doesn't * mesh at all with our frontbuffer tracking. And the hw alone isn't * good enough. */ - val =EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE ; + val |=EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE ;if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >5 ) val |=EDP_PSR2_TP2_TIME_2500 ;@@ -333,6 +348,20 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp)I915_WRITE (EDP_PSR2_CTL , val); } + +static void hsw_psr_enable_source (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); + +/* psr1 and psr2 are mutually exclusive.*/ +if (dev_priv->psr.psr2_support) +intel_enable_source_psr2 (intel_dp); +else +intel_enable_source_psr1 (intel_dp); +} +static bool intel_psr_match_conditions (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);@@ -410,7 +439,10 @@ static void intel_psr_activate(struct intel_dp *intel_dp)struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ); +else +WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE );WARN_ON (dev_priv->psr.active);lockdep_assert_held (&dev_priv->psr.lock);@@ -462,8 +494,6 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.busy_frontbuffer_bits =0 ;if (HAS_DDI (dev_priv)) { -hsw_psr_setup_vsc (intel_dp); -if (dev_priv->psr.psr2_support) {/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ if (crtc->config->pipe_src_w > 3200 ||
drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 506
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -471,8 +501,10 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = false; elseskl_psr_setup_su_vsc (intel_dp ); + }else { +/* set up vsc header for psr1 */ +hsw_psr_setup_vsc (intel_dp);
This might fail if psr2_support = false 2 lines above happens... So code will continue on psr1 without any vsc setup. This logic needs to be reworked.
Or probably the psr2 check and restriction properly moved to match_conditions function, where is the right place for all conditional behavior checking. (Preferably in a separated patch before this one).
Quoted 40 lines
drivers/gpu/drm/i915/intel_psr.c +21
-8} -/* * Per Spec: Avoid continuous PSR exit by masking MEMUP and HPD. * Also mask LPSP to avoid dependency on other drivers that @@ -557,20 +589,37 @@ static void hsw_psr_disable(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv =to_i915 (dev);if (dev_priv->psr.active) { -I915_WRITE (EDP_PSR_CTL , -I915_READ (EDP_PSR_CTL ) & ~EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +I915_WRITE (EDP_PSR2_CTL , +I915_READ (EDP_PSR2_CTL ) & + ~(EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE )); +else +I915_WRITE (EDP_PSR_CTL , +I915_READ (EDP_PSR_CTL ) & ~EDP_PSR_ENABLE );/* Wait till PSR is idle */ -if (intel_wait_for_register (dev_priv, -EDP_PSR_STATUS_CTL , -EDP_PSR_STATUS_STATE_MASK , -0 , -2000 )) +if (dev_priv->psr.psr2_support) { +if (intel_wait_for_register (dev_priv, +EDP_PSR2_STATUS_CTL , +EDP_PSR2_STATUS_STATE_MASK , +0 , +2000 )) +DRM_ERROR ("Timed out waiting for PSR2 Idle State\n" ); + }else { +if (intel_wait_for_register (dev_priv, +EDP_PSR_STATUS_CTL , +EDP_PSR_STATUS_STATE_MASK , +0 , +2000 ))DRM_ERROR ("Timed out waiting for PSR Idle State\n" );
drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_disable(struct intel_dp *intel_dp) · line 623
Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +5
-2- + } dev_priv->psr.active = false; }else { -WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ); +else +WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); }
All these 40 lines above deserve separated functions as well.
or at least invert the checks first psr2 then active... better for reading one or another imo..
Quoted 45 lines
drivers/gpu/drm/i915/intel_psr.c +20
-12}@@ -621,13 +670,24 @@ static void intel_psr_work(struct work_struct *work)* and be ready for re-enable. */ if (HAS_DDI (dev_priv)) { -if (intel_wait_for_register (dev_priv, -EDP_PSR_STATUS_CTL , -EDP_PSR_STATUS_STATE_MASK , -0 , -50 )) { -DRM_ERROR ("Timed out waiting for PSR Idle for re-enable\n" ); -return ; +if (dev_priv->psr.psr2_support) { +if (intel_wait_for_register (dev_priv, +EDP_PSR2_STATUS_CTL , +EDP_PSR2_STATUS_STATE_MASK , +0 , +50 )) { +DRM_ERROR ("Timed out waiting for PSR2 Idle for re-enable\n" ); +return ; + } + }else { +if (intel_wait_for_register (dev_priv, +EDP_PSR_STATUS_CTL , +EDP_PSR_STATUS_STATE_MASK , +0 , +50 )) { +DRM_ERROR ("Timed out waiting for PSR Idle for re-enable\n" ); +return ; + } } }else { if (intel_wait_for_register(dev_priv,@@ -669,11 +729,15 @@ static void intel_psr_exit(struct drm_i915_private *dev_priv)return ;if (HAS_DDI (dev_priv)) { - val =I915_READ (EDP_PSR_CTL ); - -WARN_ON (!(val &EDP_PSR_ENABLE )); - -I915_WRITE (EDP_PSR_CTL , val & ~EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) { + val =I915_READ (EDP_PSR2_CTL );
drivers/gpu/drm/i915/intel_psr.c static void intel_psr_exit(struct drm_i915_private *dev_priv) · line 743
Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +7
-0+WARN_ON (!(val &EDP_PSR2_ENABLE )); +I915_WRITE (EDP_PSR2_CTL , val & ~EDP_PSR2_ENABLE ); + }else { + val =I915_READ (EDP_PSR_CTL ); +WARN_ON (!(val &EDP_PSR_ENABLE )); +I915_WRITE (EDP_PSR_CTL , val & ~EDP_PSR_ENABLE ); + } }else { val =I915_READ (VLV_PSRCTL (pipe));
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo,
The code is
if (dev_priv->psr.psr2_support) {
/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */
if (crtc->config->pipe_src_w > 3200 ||
crtc->config->pipe_src_h > 2000)
dev_priv->psr.psr2_support = false;
else
skl_psr_setup_su_vsc(intel_dp);
} else {
/* set up vsc header for psr1 */
hsw_psr_setup_vsc(intel_dp);
}If psr2_support=0 , then it calls hsw_psr_setup_vsc(intel_dp); {psr1 vsc setup) If psr2_support=1 then it calls skl_psr_setup_su_vsc(intel_dp); (psr2 vsc setup)
Regards,
vathsala
-----Original Message-----
From: Vivi, Rodrigo
Sent: Friday, January 6, 2017 2:12 AM
To: Nagaraju, Vathsala <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Patil, Deepti <[email protected]>
Subject: Re: [PATCH 03/10] drm/i915/psr: fix blank screen issue for psr2
Quoted 131 lines · vathsala nagaraju
Psr1 and psr2 are mutually exclusive,ie when psr2 is enabled, psr1 should be disabled.When psr2 is exited , bit 31 of reg
PSR2_CTLmust be set to 0 but currently bit 31 ofSRD_CTL
(psr1 control register)is set to 0.
Also ,PSR2_IDLE state is looked up fromSRD_STATUS(psr1 register)instead ofPSR2_STATUSregister, which has wrong data, resulting in blankscreen.hsw_enable_sourceis split intohsw_enable_source_psr1andhsw_enable_source_psr2for easier code review and maintenance, as suggested by rodrigo and jim.v2: (Vivi Rodrigo)
- Rename hsw_enable_source_psr* to intel_enable_source_psr*Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by Vathsala Nagaraju <[email protected]>Signed-off-by Patil Deepti <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/intel_psr.c | 124 +++++++++++++++++++++++++++++---------- 2 files changed, 97 insertions(+), 30 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_reg.hindex 00970aa..7830e6e 100644drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -3615,6 +3615,9 @@ enum {#define EDP_PSR2_FRAME_BEFORE_SU_MASK (0xf<<4)#define EDP_PSR2_IDLE_MASK 0xf +#define EDP_PSR2_STATUS_CTL _MMIO(0x6f940) +#define EDP_PSR2_STATUS_STATE_MASK (0xf<<28) +/* VGA port control */ #define ADPA _MMIO(0x61100)#define PCH_ADPA _MMIO(0xe1100)drivers/gpu/drm/i915/intel_psr.c +36
-9@@ -261,12 +261,11 @@ static void vlv_psr_activate(struct intel_dp *intel_dp) VLV_EDP_PSR_ACTIVE_ENTRY); } -static void hsw_psr_enable_source (struct intel_dp *intel_dp) +static void intel_enable_source_psr1 (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -uint32_t max_sleep_time =0x1f ;/* * Let's respect VBT in case VBT asks a higher idle_frame value. @@ -312,14 +311,30 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) val |=EDP_PSR_TP1_TP2_SEL ;I915_WRITE (EDP_PSR_CTL , val); +} -if (!dev_priv->psr.psr2_support) -return ; +static void intel_enable_source_psr2 (struct intel_dp *intel_dp) { +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); + +/* +* Let's respect VBT in case VBT asks a higher idle_frame value. +* Let's use 6 as the minimum to cover all known cases including +* the off-by-one issue that HW has in some cases. Also there are +* cases where sink should be able to train +* with the 5 or 6 idle patterns. +*/ +uint32_t idle_frames =max (6 , dev_priv->vbt.psr.idle_frames); +uint32_t val =EDP_PSR_ENABLE ; + + val |= idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT ;/* FIXME: selective update is probably totally broken because it doesn't * mesh at all with our frontbuffer tracking. And the hw alone isn't * good enough. */ - val =EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE ; + val |=EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE ;if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >5 ) val |=EDP_PSR2_TP2_TIME_2500 ;@@ -333,6 +348,20 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp)I915_WRITE (EDP_PSR2_CTL , val); } + +static void hsw_psr_enable_source (struct intel_dp *intel_dp) { +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); + +/* psr1 and psr2 are mutually exclusive.*/ +if (dev_priv->psr.psr2_support) +intel_enable_source_psr2 (intel_dp); +else +intel_enable_source_psr1 (intel_dp); +} +static bool intel_psr_match_conditions (struct intel_dp *intel_dp) { struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); @@ -410,7 +439,10 @@ static void intel_psr_activate(struct intel_dp *intel_dp)struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ); +else +WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE );WARN_ON (dev_priv->psr.active);lockdep_assert_held (&dev_priv->psr.lock);@@ -462,8 +494,6 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.busy_frontbuffer_bits =0 ;if (HAS_DDI (dev_priv)) { -hsw_psr_setup_vsc (intel_dp); -if (dev_priv->psr.psr2_support) {/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ if (crtc->config->pipe_src_w > 3200 || @@ -471,8 +501,10 @@ void
intel_psr_enable(struct intel_dp *intel_dp)
drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 506
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0dev_priv->psr.psr2_support = false; elseskl_psr_setup_su_vsc (intel_dp ); + }else { +/* set up vsc header for psr1 */ +hsw_psr_setup_vsc (intel_dp);
This might fail if psr2_support = false 2 lines above happens... So code will continue on psr1 without any vsc setup. This logic needs to be reworked.
Or probably the psr2 check and restriction properly moved to match_conditions function, where is the right place for all conditional behavior checking. (Preferably in a separated patch before this one).
Quoted 40 lines
drivers/gpu/drm/i915/intel_psr.c +21
-9} -/* * Per Spec: Avoid continuous PSR exit by masking MEMUP and HPD. * Also mask LPSP to avoid dependency on other drivers that @@ -557,20 +589,37 @@ static void hsw_psr_disable(struct intel_dp *intel_dp) struct drm_i915_private *dev_priv = to_i915(dev); if (dev_priv->psr.active) { -I915_WRITE(EDP_PSR_CTL, -I915_READ(EDP_PSR_CTL) & ~EDP_PSR_ENABLE); +if (dev_priv->psr.psr2_support) +I915_WRITE(EDP_PSR2_CTL, +I915_READ(EDP_PSR2_CTL) & +~(EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE)); +else +I915_WRITE(EDP_PSR_CTL, +I915_READ(EDP_PSR_CTL) & ~EDP_PSR_ENABLE); /* Wait till PSR is idle */ -if (intel_wait_for_register (dev_priv, -EDP_PSR_STATUS_CTL , -EDP_PSR_STATUS_STATE_MASK , -0 , -2000 )) +if (dev_priv->psr.psr2_support) { +if (intel_wait_for_register (dev_priv, +EDP_PSR2_STATUS_CTL , +EDP_PSR2_STATUS_STATE_MASK , +0 , +2000 )) +DRM_ERROR ("Timed out waiting for PSR2 Idle State\n" ); + }else { +if (intel_wait_for_register (dev_priv, +EDP_PSR_STATUS_CTL , +EDP_PSR_STATUS_STATE_MASK , +0 , +2000 ))DRM_ERROR ("Timed out waiting for PSR Idle State\n" );
drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_disable(struct intel_dp *intel_dp) · line 623
Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +5
-2- + } dev_priv->psr.active = false; }else { -WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ); +else +WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); }
All these 40 lines above deserve separated functions as well.
or at least invert the checks first psr2 then active... better for reading one or another imo..
Quoted 45 lines
}
drivers/gpu/drm/i915/intel_psr.c +20
-12@@ -621,13 +670,24 @@ static void intel_psr_work(struct work_struct *work)* and be ready for re-enable. */ if (HAS_DDI (dev_priv)) { -if (intel_wait_for_register (dev_priv, -EDP_PSR_STATUS_CTL , -EDP_PSR_STATUS_STATE_MASK , -0 , -50 )) { -DRM_ERROR ("Timed out waiting for PSR Idle for re-enable\n" ); -return ; +if (dev_priv->psr.psr2_support) { +if (intel_wait_for_register (dev_priv, +EDP_PSR2_STATUS_CTL , +EDP_PSR2_STATUS_STATE_MASK , +0 , +50 )) { +DRM_ERROR ("Timed out waiting for PSR2 Idle for re-enable\n" ); +return ; + } + }else { +if (intel_wait_for_register (dev_priv, +EDP_PSR_STATUS_CTL , +EDP_PSR_STATUS_STATE_MASK , +0 , +50 )) { +DRM_ERROR ("Timed out waiting for PSR Idle for re-enable\n" ); +return ; + } } }else { if (intel_wait_for_register(dev_priv,@@ -669,11 +729,15 @@ static void intel_psr_exit(struct drm_i915_private *dev_priv)return ;if (HAS_DDI (dev_priv)) { - val =I915_READ (EDP_PSR_CTL ); - -WARN_ON (!(val &EDP_PSR_ENABLE )); - -I915_WRITE (EDP_PSR_CTL , val & ~EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) { + val =I915_READ (EDP_PSR2_CTL );
drivers/gpu/drm/i915/intel_psr.c static void intel_psr_exit(struct drm_i915_private *dev_priv) · line 743
Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +7
-0+WARN_ON (!(val &EDP_PSR2_ENABLE )); +I915_WRITE (EDP_PSR2_CTL , val & ~EDP_PSR2_ENABLE ); + }else { + val =I915_READ (EDP_PSR_CTL ); +WARN_ON (!(val &EDP_PSR_ENABLE )); +I915_WRITE (EDP_PSR_CTL , val & ~EDP_PSR_ENABLE ); + } }else { val =I915_READ (VLV_PSRCTL (pipe));
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/10 drm/i915/psr: fix blank screen issue for psr2
In reply to vathsala nagarajuPsr1 and psr2 are mutually exclusive,ie when psr2 is enabled, psr1 should be disabled.When psr2 is exited , bit 31 of reg PSR2_CTL must be set to 0 but currently bit 31 of SRD_CTL (psr1 control register)is set to 0.
Also ,PSR2_IDLE state is looked up from SRD_STATUS(psr1 register) instead of PSR2_STATUS register, which has wrong data, resulting in blankscreen.hsw_enable_source is split into hsw_enable_source_psr1 and hsw_enable_source_psr2 for easier code review and maintenance, as suggested by rodrigo and jim.
v2: (Rodrigo)
- Rename hsw_enable_source_psr* to intel_enable_source_psr*
v3: (Rodrigo)
- In hsw_psr_disable ,
1) for psr active case, handle psr2 followed by psr1.
2) psr inactive case, handle psr2 followed by psr1
--- drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/intel_psr.c | 126 +++++++++++++++++++++++++++++---------- 2 files changed, 97 insertions(+), 32 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -3615,6 +3615,9 @@ enum {#define EDP_PSR2_FRAME_BEFORE_SU_MASK (0xf<<4)#define EDP_PSR2_IDLE_MASK 0xf +#define EDP_PSR2_STATUS_CTL _MMIO(0x6f940) +#define EDP_PSR2_STATUS_STATE_MASK (0xf<<28) +/* VGA port control */ #define ADPA _MMIO(0x61100)#define PCH_ADPA _MMIO(0xe1100)
drivers/gpu/drm/i915/intel_psr.c +94 -32
193 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerQuoted 11 lines · vathsala nagaraju
Psr1 and psr2 are mutually exclusive,ie when psr2 is enabled, psr1 should be disabled.When psr2 is exited , bit 31 of reg
PSR2_CTLmust be set to 0 but currently bit 31 ofSRD_CTL(psr1 control register)is set to 0.
Also ,PSR2_IDLE state is looked up fromSRD_STATUS(psr1 register)instead ofPSR2_STATUSregister, which has wrong data, resulting in blankscreen.hsw_enable_sourceis split intohsw_enable_source_psr1andhsw_enable_source_psr2for easier code review and maintenance, as suggested by rodrigo and jim.
Quoted 7 lines
v2: (Rodrigo)
- Rename hsw_enable_source_psr* to intel_enable_source_psr*v3: (Rodrigo)
- Inhsw_psr_disable,
1) for psr active case, handle psr2 followed by psr1.
2) psr inactive case, handle psr2 followed by psr1
much better, thanks, but still has one blocking issue imho:
Quoted 119 lines
Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by Vathsala Nagaraju <[email protected]>Signed-off-by Patil Deepti <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/intel_psr.c | 126 +++++++++++++++++++++++++++++---------- 2 files changed, 97 insertions(+), 32 deletions(-)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -3615,6 +3615,9 @@ enum {#define EDP_PSR2_FRAME_BEFORE_SU_MASK (0xf<<4)#define EDP_PSR2_IDLE_MASK 0xf +#define EDP_PSR2_STATUS_CTL _MMIO(0x6f940) +#define EDP_PSR2_STATUS_STATE_MASK (0xf<<28) +/* VGA port control */ #define ADPA _MMIO(0x61100)#define PCH_ADPA _MMIO(0xe1100)drivers/gpu/drm/i915/intel_psr.c +38
-8@@ -261,12 +261,11 @@ static void vlv_psr_activate(struct intel_dp *intel_dp) VLV_EDP_PSR_ACTIVE_ENTRY); } -static void hsw_psr_enable_source (struct intel_dp *intel_dp) +static void intel_enable_source_psr1 (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -uint32_t max_sleep_time =0x1f ;/* * Let's respect VBT in case VBT asks a higher idle_frame value. @@ -312,14 +311,30 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) val |=EDP_PSR_TP1_TP2_SEL ;I915_WRITE (EDP_PSR_CTL , val); +} -if (!dev_priv->psr.psr2_support) -return ; +static void intel_enable_source_psr2 (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); + +/* +* Let's respect VBT in case VBT asks a higher idle_frame value. +* Let's use 6 as the minimum to cover all known cases including +* the off-by-one issue that HW has in some cases. Also there are +* cases where sink should be able to train +* with the 5 or 6 idle patterns. +*/ +uint32_t idle_frames =max (6 , dev_priv->vbt.psr.idle_frames); +uint32_t val =EDP_PSR_ENABLE ; + + val |= idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT ;/* FIXME: selective update is probably totally broken because it doesn't * mesh at all with our frontbuffer tracking. And the hw alone isn't * good enough. */ - val =EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE ; + val |=EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE ;if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >5 ) val |=EDP_PSR2_TP2_TIME_2500 ;@@ -333,6 +348,20 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp)I915_WRITE (EDP_PSR2_CTL , val); } + +static void hsw_psr_enable_source (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); + +/* psr1 and psr2 are mutually exclusive.*/ +if (dev_priv->psr.psr2_support) +intel_enable_source_psr2 (intel_dp); +else +intel_enable_source_psr1 (intel_dp); +} +static bool intel_psr_match_conditions (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);@@ -410,7 +439,10 @@ static void intel_psr_activate(struct intel_dp *intel_dp)struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ); +else +WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE );WARN_ON (dev_priv->psr.active);lockdep_assert_held (&dev_priv->psr.lock);@@ -462,8 +494,6 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.busy_frontbuffer_bits =0 ;if (HAS_DDI (dev_priv)) { -hsw_psr_setup_vsc (intel_dp); -if (dev_priv->psr.psr2_support) {/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ if (crtc->config->pipe_src_w > 3200 ||
drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 501
Quoted 1 line
drivers/gpu/drm/i915/intel_psr.c +0
-0@@ -471,8 +501,10 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = false;
+ hsw_psr_setup_vsc(intel_dp);
without this you will end up enabling psr1 but not setting up the vsc.
But also if I understood correctly this will fail anyways right? So before this patch we need one that move this restriction to match_conditions function returning false and fully blocking PSR.
Quoted 100 lines
drivers/gpu/drm/i915/intel_psr.c +49
-24else skl_psr_setup_su_vsc (intel_dp); + }else { +/* set up vsc header for psr1 */ +hsw_psr_setup_vsc (intel_dp); } -/* * Per Spec: Avoid continuous PSR exit by masking MEMUP and HPD. * Also mask LPSP to avoid dependency on other drivers that @@ -557,20 +589,35 @@ static void hsw_psr_disable(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv =to_i915 (dev);if (dev_priv->psr.active) { -I915_WRITE (EDP_PSR_CTL , -I915_READ (EDP_PSR_CTL ) & ~EDP_PSR_ENABLE ); - -/* Wait till PSR is idle */ -if (intel_wait_for_register (dev_priv, -EDP_PSR_STATUS_CTL , -EDP_PSR_STATUS_STATE_MASK , -0 , -2000 )) +if (dev_priv->psr.psr2_support) { +I915_WRITE (EDP_PSR2_CTL , +I915_READ (EDP_PSR2_CTL ) & + ~(EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE )); +/* Wait till PSR2 is idle */ +if (intel_wait_for_register (dev_priv, +EDP_PSR2_STATUS_CTL , +EDP_PSR2_STATUS_STATE_MASK , +0 , +2000 )) +DRM_ERROR ("Timed out waiting for PSR2 Idle State\n" ); + }else { +I915_WRITE (EDP_PSR_CTL , +I915_READ (EDP_PSR_CTL ) & ~EDP_PSR_ENABLE ); +/* Wait till PSR1 is idle */ +if (intel_wait_for_register (dev_priv, +EDP_PSR_STATUS_CTL , +EDP_PSR_STATUS_STATE_MASK , +0 , +2000 ))DRM_ERROR ("Timed out waiting for PSR Idle State\n" ); - + } dev_priv->psr.active = false; }else { -WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ); +else +WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } }@@ -621,13 +668,24 @@ static void intel_psr_work(struct work_struct *work)* and be ready for re-enable. */ if (HAS_DDI (dev_priv)) { -if (intel_wait_for_register (dev_priv, -EDP_PSR_STATUS_CTL , -EDP_PSR_STATUS_STATE_MASK , -0 , -50 )) { -DRM_ERROR ("Timed out waiting for PSR Idle for re-enable\n" ); -return ; +if (dev_priv->psr.psr2_support) { +if (intel_wait_for_register (dev_priv, +EDP_PSR2_STATUS_CTL , +EDP_PSR2_STATUS_STATE_MASK , +0 , +50 )) { +DRM_ERROR ("Timed out waiting for PSR2 Idle for re-enable\n" ); +return ; + } + }else { +if (intel_wait_for_register (dev_priv, +EDP_PSR_STATUS_CTL , +EDP_PSR_STATUS_STATE_MASK , +0 , +50 )) { +DRM_ERROR ("Timed out waiting for PSR Idle for re-enable\n" ); +return ; + } } }else { if (intel_wait_for_register(dev_priv,@@ -669,11 +727,15 @@ static void intel_psr_exit(struct drm_i915_private *dev_priv)return ;if (HAS_DDI (dev_priv)) { - val =I915_READ (EDP_PSR_CTL ); - -WARN_ON (!(val &EDP_PSR_ENABLE )); - -I915_WRITE (EDP_PSR_CTL , val & ~EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) { + val =I915_READ (EDP_PSR2_CTL );
drivers/gpu/drm/i915/intel_psr.c static void intel_psr_exit(struct drm_i915_private *dev_priv) · line 741
Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +7
-0+WARN_ON (!(val &EDP_PSR2_ENABLE )); +I915_WRITE (EDP_PSR2_CTL , val & ~EDP_PSR2_ENABLE ); + }else { + val =I915_READ (EDP_PSR_CTL ); +WARN_ON (!(val &EDP_PSR_ENABLE )); +I915_WRITE (EDP_PSR_CTL , val & ~EDP_PSR_ENABLE ); + } }else { val =I915_READ (VLV_PSRCTL (pipe));
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 142 lines · Rodrigo
Quoted 11 lines · vathsala nagaraju
Psr1 and psr2 are mutually exclusive,ie when psr2 is enabled, psr1 should be disabled.When psr2 is exited , bit 31 of reg
PSR2_CTLmust be set to 0 but currently bit 31 ofSRD_CTL(psr1 control register)is set to 0.
Also ,PSR2_IDLE state is looked up fromSRD_STATUS(psr1 register)instead ofPSR2_STATUSregister, which has wrong data, resulting in blankscreen.hsw_enable_sourceis split intohsw_enable_source_psr1andhsw_enable_source_psr2for easier code review and maintenance, as suggested by rodrigo and jim.Quoted 7 lines
v2: (Rodrigo)
- Rename hsw_enable_source_psr* to intel_enable_source_psr*v3: (Rodrigo)
- Inhsw_psr_disable,
1) for psr active case, handle psr2 followed by psr1.
2) psr inactive case, handle psr2 followed by psr1much better, thanks, but still has one blocking issue imho:
Quoted 119 lines
Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by Vathsala Nagaraju <[email protected]>Signed-off-by Patil Deepti <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/intel_psr.c | 126 +++++++++++++++++++++++++++++---------- 2 files changed, 97 insertions(+), 32 deletions(-)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -3615,6 +3615,9 @@ enum {#define EDP_PSR2_FRAME_BEFORE_SU_MASK (0xf<<4)#define EDP_PSR2_IDLE_MASK 0xf +#define EDP_PSR2_STATUS_CTL _MMIO(0x6f940) +#define EDP_PSR2_STATUS_STATE_MASK (0xf<<28) +/* VGA port control */ #define ADPA _MMIO(0x61100)#define PCH_ADPA _MMIO(0xe1100)drivers/gpu/drm/i915/intel_psr.c +38
-8@@ -261,12 +261,11 @@ static void vlv_psr_activate(struct intel_dp *intel_dp) VLV_EDP_PSR_ACTIVE_ENTRY); } -static void hsw_psr_enable_source (struct intel_dp *intel_dp) +static void intel_enable_source_psr1 (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -uint32_t max_sleep_time =0x1f ;/* * Let's respect VBT in case VBT asks a higher idle_frame value. @@ -312,14 +311,30 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) val |=EDP_PSR_TP1_TP2_SEL ;I915_WRITE (EDP_PSR_CTL , val); +} -if (!dev_priv->psr.psr2_support) -return ; +static void intel_enable_source_psr2 (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); + +/* +* Let's respect VBT in case VBT asks a higher idle_frame value. +* Let's use 6 as the minimum to cover all known cases including +* the off-by-one issue that HW has in some cases. Also there are +* cases where sink should be able to train +* with the 5 or 6 idle patterns. +*/ +uint32_t idle_frames =max (6 , dev_priv->vbt.psr.idle_frames); +uint32_t val =EDP_PSR_ENABLE ; + + val |= idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT ;/* FIXME: selective update is probably totally broken because it doesn't * mesh at all with our frontbuffer tracking. And the hw alone isn't * good enough. */ - val =EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE ; + val |=EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE ;if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >5 ) val |=EDP_PSR2_TP2_TIME_2500 ;@@ -333,6 +348,20 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp)I915_WRITE (EDP_PSR2_CTL , val); } + +static void hsw_psr_enable_source (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); + +/* psr1 and psr2 are mutually exclusive.*/ +if (dev_priv->psr.psr2_support) +intel_enable_source_psr2 (intel_dp); +else +intel_enable_source_psr1 (intel_dp); +} +static bool intel_psr_match_conditions (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);@@ -410,7 +439,10 @@ static void intel_psr_activate(struct intel_dp *intel_dp)struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ); +else +WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE );WARN_ON (dev_priv->psr.active);lockdep_assert_held (&dev_priv->psr.lock);@@ -462,8 +494,6 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.busy_frontbuffer_bits =0 ;if (HAS_DDI (dev_priv)) { -hsw_psr_setup_vsc (intel_dp); -if (dev_priv->psr.psr2_support) {/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ if (crtc->config->pipe_src_w > 3200 ||@@ -471,8 +501,10 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.psr2_support = false;drivers/gpu/drm/i915/intel_psr.c +1
-0+hsw_psr_setup_vsc (intel_dp);
Quoted 6 lines
without this you will end up enabling psr1 but not setting up the vsc.
But also if I understood correctly this will fail anyways right? So before this patch we need one that move this restriction to
match_conditionsfunction returning false and fully blocking PSR.
thanks. I have posted a new patch. please review
Quoted 103 lines
Quoted 103 lines
drivers/gpu/drm/i915/intel_psr.c +51
-24else skl_psr_setup_su_vsc (intel_dp); + }else { +/* set up vsc header for psr1 */ +hsw_psr_setup_vsc (intel_dp); } -/* * Per Spec: Avoid continuous PSR exit by masking MEMUP and HPD. * Also mask LPSP to avoid dependency on other drivers that @@ -557,20 +589,35 @@ static void hsw_psr_disable(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv =to_i915 (dev);if (dev_priv->psr.active) { -I915_WRITE (EDP_PSR_CTL , -I915_READ (EDP_PSR_CTL ) & ~EDP_PSR_ENABLE ); - -/* Wait till PSR is idle */ -if (intel_wait_for_register (dev_priv, -EDP_PSR_STATUS_CTL , -EDP_PSR_STATUS_STATE_MASK , -0 , -2000 )) +if (dev_priv->psr.psr2_support) { +I915_WRITE (EDP_PSR2_CTL , +I915_READ (EDP_PSR2_CTL ) & + ~(EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE )); +/* Wait till PSR2 is idle */ +if (intel_wait_for_register (dev_priv, +EDP_PSR2_STATUS_CTL , +EDP_PSR2_STATUS_STATE_MASK , +0 , +2000 )) +DRM_ERROR ("Timed out waiting for PSR2 Idle State\n" ); + }else { +I915_WRITE (EDP_PSR_CTL , +I915_READ (EDP_PSR_CTL ) & ~EDP_PSR_ENABLE ); +/* Wait till PSR1 is idle */ +if (intel_wait_for_register (dev_priv, +EDP_PSR_STATUS_CTL , +EDP_PSR_STATUS_STATE_MASK , +0 , +2000 ))DRM_ERROR ("Timed out waiting for PSR Idle State\n" ); - + } dev_priv->psr.active = false; }else { -WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ); +else +WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } }@@ -621,13 +668,24 @@ static void intel_psr_work(struct work_struct *work)* and be ready for re-enable. */ if (HAS_DDI (dev_priv)) { -if (intel_wait_for_register (dev_priv, -EDP_PSR_STATUS_CTL , -EDP_PSR_STATUS_STATE_MASK , -0 , -50 )) { -DRM_ERROR ("Timed out waiting for PSR Idle for re-enable\n" ); -return ; +if (dev_priv->psr.psr2_support) { +if (intel_wait_for_register (dev_priv, +EDP_PSR2_STATUS_CTL , +EDP_PSR2_STATUS_STATE_MASK , +0 , +50 )) { +DRM_ERROR ("Timed out waiting for PSR2 Idle for re-enable\n" ); +return ; + } + }else { +if (intel_wait_for_register (dev_priv, +EDP_PSR_STATUS_CTL , +EDP_PSR_STATUS_STATE_MASK , +0 , +50 )) { +DRM_ERROR ("Timed out waiting for PSR Idle for re-enable\n" ); +return ; + } } }else { if (intel_wait_for_register(dev_priv,@@ -669,11 +727,15 @@ static void intel_psr_exit(struct drm_i915_private *dev_priv)return ;if (HAS_DDI (dev_priv)) { - val =I915_READ (EDP_PSR_CTL ); - -WARN_ON (!(val &EDP_PSR_ENABLE )); - -I915_WRITE (EDP_PSR_CTL , val & ~EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) { + val =I915_READ (EDP_PSR2_CTL ); +WARN_ON (!(val &EDP_PSR2_ENABLE )); +I915_WRITE (EDP_PSR2_CTL , val & ~EDP_PSR2_ENABLE );
Quoted 8 lines
drivers/gpu/drm/i915/intel_psr.c static void intel_psr_exit(struct drm_i915_private *dev_priv) · line 741
Quoted 8 lines
drivers/gpu/drm/i915/intel_psr.c +5
-0+ }else { + val =I915_READ (EDP_PSR_CTL ); +WARN_ON (!(val &EDP_PSR_ENABLE )); +I915_WRITE (EDP_PSR_CTL , val & ~EDP_PSR_ENABLE ); + } }else { val =I915_READ (VLV_PSRCTL (pipe));
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/10 drm/i915/psr: fix blank screen issue for psr2
In reply to Vivi, RodrigoPsr1 and psr2 are mutually exclusive,ie when psr2 is enabled, psr1 should be disabled.When psr2 is exited , bit 31 of reg PSR2_CTL must be set to 0 but currently bit 31 of SRD_CTL (psr1 control register)is set to 0.
Also ,PSR2_IDLE state is looked up from SRD_STATUS(psr1 register) instead of PSR2_STATUS register, which has wrong data, resulting in blankscreen.hsw_enable_source is split into hsw_enable_source_psr1 and hsw_enable_source_psr2 for easier code review and maintenance, as suggested by rodrigo and jim.
v2: (Rodrigo)
- Rename hsw_enable_source_psr* to intel_enable_source_psr*
v3: (Rodrigo)
- In hsw_psr_disable ,
1) for psr active case, handle psr2 followed by psr1.
2) psr inactive case, handle psr2 followed by psr1
v4:(Rodrigo)
- move psr2 restriction(32X20) to match_conditions function returning false and fully blocking PSR to a new patch before this one.
v5: in source_psr2, removed val = EDP_PSR_ENABLE
--- drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/intel_psr.c | 122 +++++++++++++++++++++++++++++---------- 2 files changed, 95 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -3615,6 +3615,9 @@ enum {#define EDP_PSR2_FRAME_BEFORE_SU_MASK (0xf<<4)#define EDP_PSR2_IDLE_MASK 0xf +#define EDP_PSR2_STATUS_CTL _MMIO(0x6f940) +#define EDP_PSR2_STATUS_STATE_MASK (0xf<<28) +/* VGA port control */ #define ADPA _MMIO(0x61100)#define PCH_ADPA _MMIO(0xe1100)
drivers/gpu/drm/i915/intel_psr.c +92 -30
180 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 231 lines · vathsala nagaraju
Psr1 and psr2 are mutually exclusive,ie when psr2 is enabled, psr1 should be disabled.When psr2 is exited , bit 31 of reg
PSR2_CTLmust be set to 0 but currently bit 31 ofSRD_CTL(psr1 control register)is set to 0.
Also ,PSR2_IDLE state is looked up fromSRD_STATUS(psr1 register)instead ofPSR2_STATUSregister, which has wrong data, resulting in blankscreen.hsw_enable_sourceis split intohsw_enable_source_psr1andhsw_enable_source_psr2for easier code review and maintenance, as suggested by rodrigo and jim.v2: (Rodrigo)
- Rename hsw_enable_source_psr* to intel_enable_source_psr*v3: (Rodrigo)
- Inhsw_psr_disable,
1) for psr active case, handle psr2 followed by psr1.
2) psr inactive case, handle psr2 followed by psr1v4:(Rodrigo)
- move psr2 restriction(32X20) tomatch_conditionsfunction returning false and fully blocking PSR to a new patch before this one.v5: in
source_psr2, removed val =EDP_PSR_ENABLECc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by Vathsala Nagaraju <[email protected]>Signed-off-by Patil Deepti <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/intel_psr.c | 122 +++++++++++++++++++++++++++++---------- 2 files changed, 95 insertions(+), 30 deletions(-)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -3615,6 +3615,9 @@ enum {#define EDP_PSR2_FRAME_BEFORE_SU_MASK (0xf<<4)#define EDP_PSR2_IDLE_MASK 0xf +#define EDP_PSR2_STATUS_CTL _MMIO(0x6f940) +#define EDP_PSR2_STATUS_STATE_MASK (0xf<<28) +/* VGA port control */ #define ADPA _MMIO(0x61100)#define PCH_ADPA _MMIO(0xe1100)drivers/gpu/drm/i915/intel_psr.c +85
-30@@ -261,7 +261,7 @@ static void vlv_psr_activate(struct intel_dp *intel_dp) VLV_EDP_PSR_ACTIVE_ENTRY); } -static void hsw_psr_enable_source (struct intel_dp *intel_dp) +static void intel_enable_source_psr1 (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = dig_port->base.base.dev;@@ -312,14 +312,29 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) val |=EDP_PSR_TP1_TP2_SEL ;I915_WRITE (EDP_PSR_CTL , val); +} -if (!dev_priv->psr.psr2_support) -return ; +static void intel_enable_source_psr2 (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +/* +* Let's respect VBT in case VBT asks a higher idle_frame value. +* Let's use 6 as the minimum to cover all known cases including +* the off-by-one issue that HW has in some cases. Also there are +* cases where sink should be able to train +* with the 5 or 6 idle patterns. +*/ +uint32_t idle_frames =max (6 , dev_priv->vbt.psr.idle_frames); +uint32_t val; + + val = idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT ;/* FIXME: selective update is probably totally broken because it doesn't * mesh at all with our frontbuffer tracking. And the hw alone isn't * good enough. */ - val =EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE ; + val |=EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE ;if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >5 ) val |=EDP_PSR2_TP2_TIME_2500 ;@@ -333,6 +348,19 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp)I915_WRITE (EDP_PSR2_CTL , val); } +static void hsw_psr_enable_source (struct intel_dp *intel_dp) +{ +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = dig_port->base.base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev); + +/* psr1 and psr2 are mutually exclusive.*/ +if (dev_priv->psr.psr2_support) +intel_enable_source_psr2 (intel_dp); +else +intel_enable_source_psr1 (intel_dp); +} +static bool intel_psr_match_conditions (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);@@ -417,7 +445,10 @@ static void intel_psr_activate(struct intel_dp *intel_dp)struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ); +else +WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE );WARN_ON (dev_priv->psr.active);lockdep_assert_held (&dev_priv->psr.lock);@@ -468,10 +499,11 @@ void intel_psr_enable(struct intel_dp *intel_dp) dev_priv->psr.busy_frontbuffer_bits =0 ;if (HAS_DDI (dev_priv)) { -hsw_psr_setup_vsc (intel_dp); -if (dev_priv->psr.psr2_support) {skl_psr_setup_su_vsc (intel_dp); + }else { +/* set up vsc header for psr1 */ +hsw_psr_setup_vsc (intel_dp); }/* @@ -558,20 +590,35 @@ static void hsw_psr_disable(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv =to_i915 (dev);if (dev_priv->psr.active) { -I915_WRITE (EDP_PSR_CTL , -I915_READ (EDP_PSR_CTL ) & ~EDP_PSR_ENABLE ); - -/* Wait till PSR is idle */ -if (intel_wait_for_register (dev_priv, -EDP_PSR_STATUS_CTL , -EDP_PSR_STATUS_STATE_MASK , -0 , -2000 )) +if (dev_priv->psr.psr2_support) { +I915_WRITE (EDP_PSR2_CTL , +I915_READ (EDP_PSR2_CTL ) & + ~(EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE )); +/* Wait till PSR2 is idle */ +if (intel_wait_for_register (dev_priv, +EDP_PSR2_STATUS_CTL , +EDP_PSR2_STATUS_STATE_MASK , +0 , +2000 )) +DRM_ERROR ("Timed out waiting for PSR2 Idle State\n" ); + }else { +I915_WRITE (EDP_PSR_CTL , +I915_READ (EDP_PSR_CTL ) & ~EDP_PSR_ENABLE ); +/* Wait till PSR1 is idle */ +if (intel_wait_for_register (dev_priv, +EDP_PSR_STATUS_CTL , +EDP_PSR_STATUS_STATE_MASK , +0 , +2000 ))DRM_ERROR ("Timed out waiting for PSR Idle State\n" ); - + } dev_priv->psr.active = false; }else { -WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) +WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ); +else +WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } }@@ -622,13 +669,24 @@ static void intel_psr_work(struct work_struct *work)* and be ready for re-enable. */ if (HAS_DDI (dev_priv)) { -if (intel_wait_for_register (dev_priv, -EDP_PSR_STATUS_CTL , -EDP_PSR_STATUS_STATE_MASK , -0 , -50 )) { -DRM_ERROR ("Timed out waiting for PSR Idle for re-enable\n" ); -return ; +if (dev_priv->psr.psr2_support) { +if (intel_wait_for_register (dev_priv, +EDP_PSR2_STATUS_CTL , +EDP_PSR2_STATUS_STATE_MASK , +0 , +50 )) { +DRM_ERROR ("Timed out waiting for PSR2 Idle for re-enable\n" ); +return ; + } + }else { +if (intel_wait_for_register (dev_priv, +EDP_PSR_STATUS_CTL , +EDP_PSR_STATUS_STATE_MASK , +0 , +50 )) { +DRM_ERROR ("Timed out waiting for PSR Idle for re-enable\n" ); +return ; + } } }else { if (intel_wait_for_register(dev_priv,@@ -670,11 +728,15 @@ static void intel_psr_exit(struct drm_i915_private *dev_priv)return ;if (HAS_DDI (dev_priv)) { - val =I915_READ (EDP_PSR_CTL ); - -WARN_ON (!(val &EDP_PSR_ENABLE )); - -I915_WRITE (EDP_PSR_CTL , val & ~EDP_PSR_ENABLE ); +if (dev_priv->psr.psr2_support) { + val =I915_READ (EDP_PSR2_CTL );
drivers/gpu/drm/i915/intel_psr.c static void intel_psr_exit(struct drm_i915_private *dev_priv) · line 742
Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +7
-0+WARN_ON (!(val &EDP_PSR2_ENABLE )); +I915_WRITE (EDP_PSR2_CTL , val & ~EDP_PSR2_ENABLE ); + }else { + val =I915_READ (EDP_PSR_CTL ); +WARN_ON (!(val &EDP_PSR_ENABLE )); +I915_WRITE (EDP_PSR_CTL , val & ~EDP_PSR_ENABLE ); + } }else { val =I915_READ (VLV_PSRCTL (pipe));
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel