drm/i915/psr: fix blank screen issue for psr2
Subsystems (2)
PATCH 1/1 drm/i915/psr: fix blank screen issue for psr2
when psr2 is enabled, psr idle condition is taken from psr1 register(SRD_STATUS) instead of psr2_status register, resulting in looping and blank screen. code changed to lookup from psr2_status and psr2_ctl instead of srd_status and srd_ctl for psr2 scenario.
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++ drivers/gpu/drm/i915/intel_psr.c | 79 +++++++++++++++++++++++++++++----------- 2 files changed, 61 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -3611,6 +3611,10 @@ 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) +#define EDP_PSR2_STATUS_STATE_IDLE 0 +/* VGA port control */ #define ADPA _MMIO(0x61100)#define PCH_ADPA _MMIO(0xe1100)
drivers/gpu/drm/i915/intel_psr.c +57 -22
108 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
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/psr: fix blank screen issue for psr2
== Series Details ==
== Series Details ==
Series: drm/i915/psr: fix blank screen issue for psr2
URL : https://patchwork.freedesktop.org/series/16801/
State : success
== Summary ==
Series 16801v1 drm/i915/psr: fix blank screen issue for psr2
https://patchwork.freedesktop.org/api/1.0/series/16801/revisions/1/mbox/
Test kms_force_connector_basic:
Subgroup force-connector-state:
dmesg-warn -> PASS (fi-snb-2520m)fi-bdw-5557u total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:247 pass:208 dwarn:0 dfail:0 fail:0 skip:39 fi-byt-j1900 total:247 pass:220 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:247 pass:216 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:247 pass:228 dwarn:0 dfail:0 fail:0 skip:19 fi-ilk-650 total:247 pass:195 dwarn:0 dfail:0 fail:0 skip:52 fi-ivb-3520m total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-ivb-3770 total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6260u total:247 pass:234 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:247 pass:224 dwarn:3 dfail:0 fail:0 skip:20 fi-skl-6770hq total:247 pass:234 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2520m total:247 pass:216 dwarn:0 dfail:0 fail:0 skip:31 fi-snb-2600 total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32
24fa971ea77320a76c074a8eb31eca00b321ec73 drm-tip: 2016y-12m-14d-13h-51m-36s UTC integration manifest 6fc873e drm/i915/psr: fix blank screen issue for psr2
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3288/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · vathsala nagaraju
when psr2 is enabled, psr idle condition is taken from psr1
register(SRD_STATUS)instead ofpsr2_statusregister, resulting in looping and blank screen. code changed to lookup frompsr2_statusandpsr2_ctlinstead ofsrd_statusandsrd_ctlfor psr2 scenario.Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by vathsala nagaraju <[email protected]>
Quoted 138 lines
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++ drivers/gpu/drm/i915/intel_psr.c | 79 +++++++++++++++++++++++++++++----------- 2 files changed, 61 insertions(+), 22 deletions(-)drivers/gpu/drm/i915/i915_reg.h +4
-0@@ -3611,6 +3611,10 @@ 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) +#define EDP_PSR2_STATUS_STATE_IDLE 0 +/* VGA port control */ #define ADPA _MMIO(0x61100)#define PCH_ADPA _MMIO(0xe1100)drivers/gpu/drm/i915/intel_psr.c +57
-22@@ -397,7 +397,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);@@ -544,20 +547,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 ); } }@@ -608,13 +628,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,@@ -656,11 +687,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