drm: Add DP PSR2 sink enable bit
Subsystems (3)
PATCH v2 1/10 drm: Add DP PSR2 sink enable bit
To comply with eDP1.4a this bit should be set when enabling PSR2.
--- include/drm/drm_dp_helper.h | 1 + 1 file changed, 1 insertion(+)
include/drm/drm_dp_helper.h +1 -0
@@ -478,6 +478,7 @@# define DP_PSR_FRAME_CAPTURE (1 << 3)# define DP_PSR_SELECTIVE_UPDATE (1 << 4)# define DP_PSR_IRQ_HPD_WITH_CRC_ERRORS (1 << 5) +# define DP_PSR_ENABLE_PSR2 (1 << 6)/* eDP 1.4a */ #define DP_ADAPTER_CTRL 0x1a0# define DP_ADAPTER_CTRL_FORCE_LOAD_SENSE (1 << 0)
Signature · 6 lines
2.16.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/10 drm: Add DP last received PSR SDP VSC register and bits
This is a register to help debug what is in the last SDP VSC packet revived by sink.
--- include/drm/drm_dp_helper.h | 9 +++++++++ 1 file changed, 9 insertions(+)
include/drm/drm_dp_helper.h +9 -0
@@ -795,6 +795,15 @@# define DP_LAST_ACTUAL_SYNCHRONIZATION_LATENCY_MASK (0xf << 4)# define DP_LAST_ACTUAL_SYNCHRONIZATION_LATENCY_SHIFT 4 +#define DP_LAST_RECEIVED_PSR_SDP 0x200a/* eDP 1.2 */ +# define DP_PSR_STATE_BIT (1 << 0)/* eDP 1.2 */ +# define DP_UPDATE_RFB_BIT (1 << 1)/* eDP 1.2 */ +# define DP_CRC_VALID_BIT (1 << 2)/* eDP 1.2 */ +# define DP_SU_VALID (1 << 3)/* eDP 1.4 */ +# define DP_FIRST_SCAN_LINE_SU_REGION (1 << 4)/* eDP 1.4 */ +# define DP_LAST_SCAN_LINE_SU_REGION (1 << 5)/* eDP 1.4 */ +# define DP_Y_COORDINATE_VALID (1 << 6)/* eDP 1.4a */ +#define DP_RECEIVER_ALPM_STATUS 0x200b/* eDP 1.4 */ # define DP_ALPM_LOCK_TIMEOUT_ERROR (1 << 0)
Signature · 6 lines
2.16.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/10 drm/i915/psr: Nuke aux frame sync
In reply to José Roberto de SouzaeDP spec states that aux frame is required to do PSR2 selective update but i915 don't fully implement it. It sends the aux frame sync messages but the value is always zero as the GTC is not enabled in driver.
Through tests was findout that pannels can do selective update when the y-coordinate is also included in SDP, that is why it is required to run PSR2 in i915.
A dummy value is not useful at all to sink, so removing everything related to aux frame sync, if GTC is enabled we can bring this back.
--- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/intel_psr.c | 24 +----------------------- 2 files changed, 1 insertion(+), 24 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -603,7 +603,6 @@ struct i915_psr {struct delayed_work work;unsigned busy_frontbuffer_bits;bool psr2_support; -bool aux_frame_sync;bool link_standby;bool y_cord_support;bool colorimetry_support;
drivers/gpu/drm/i915/intel_psr.c +1 -23
@@ -137,16 +137,9 @@ void intel_psr_init_dpcd(struct intel_dp *intel_dp)if (INTEL_GEN (dev_priv) >=9 && (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { -uint8_t frame_sync_cap; dev_priv->psr.sink_support = true; -if (drm_dp_dpcd_readb (&intel_dp->aux, -DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , - &frame_sync_cap) !=1 ) - frame_sync_cap =0 ; - dev_priv->psr.aux_frame_sync = frame_sync_cap &DP_AUX_FRAME_SYNC_CAP ; -/* PSR2 needs frame sync as well */ - dev_priv->psr.psr2_support = dev_priv->psr.aux_frame_sync; + dev_priv->psr.psr2_support = true;DRM_DEBUG_KMS ("PSR2 %s on sink" , dev_priv->psr.psr2_support ?"supported" :"not supported" );
@@ -268,12 +261,6 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)struct drm_device *dev = dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); - -/* Enable AUX frame sync at sink */ -if (dev_priv->psr.aux_frame_sync) -drm_dp_dpcd_writeb (&intel_dp->aux, -DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF , -DP_AUX_FRAME_SYNC_ENABLE );/* Enable ALPM at sink for psr2 */ if (dev_priv->psr.psr2_support && dev_priv->psr.alpm) drm_dp_dpcd_writeb(&intel_dp->aux,
@@ -712,11 +699,6 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,i915_reg_t psr_status;u32 psr_status_mask; -if (dev_priv->psr.aux_frame_sync) -drm_dp_dpcd_writeb (&intel_dp->aux, -DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF , -0 ); -if (dev_priv->psr.psr2_support) { psr_status =EDP_PSR2_STATUS ; psr_status_mask =EDP_PSR2_STATUS_STATE_MASK ;
@@ -860,10 +842,6 @@ static void intel_psr_exit(struct drm_i915_private *dev_priv)return ;if (HAS_DDI (dev_priv)) { -if (dev_priv->psr.aux_frame_sync) -drm_dp_dpcd_writeb (&intel_dp->aux, -DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF , -0 );if (dev_priv->psr.psr2_support) { val =I915_READ (EDP_PSR2_CTL );WARN_ON (!(val &EDP_PSR2_ENABLE ));
Signature · 6 lines
2.16.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/10 drm/i915/psr: Tie PSR2 support to Y coordinate requirement
In reply to José Roberto de SouzaAlthough i915 don't implement aux sync frame through tests was findout that pannels can do selective update when the y-coordinate is also included in SDP, that is why it is required to run PSR2 in i915.
So moving to only one place the sink requirements that the actual driver needs to enable PSR2.
Also intel_psr2_config_valid() is called every time the crtc config is computed, wasting some time every time it was checking for Y coordinate requirement.
This allow us to nuke y_cord_support and some of VSC setup code that was handling a scenario that would never happen(PSR2 without Y coordinate).
Also here renaming intel_dp_get_y_cord_status() to intel_dp_get_y_coord_required() as it more accurate to the name and function of bit according to eDP spec.
--- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/intel_psr.c | 46 +++++++++++++++++----------------------- 2 files changed, 19 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -604,7 +604,6 @@ struct i915_psr {unsigned busy_frontbuffer_bits;bool psr2_support;bool link_standby; -bool y_cord_support;bool colorimetry_support;bool alpm;bool has_hw_tracking;
drivers/gpu/drm/i915/intel_psr.c +19 -27
95 lines not on this page · raw message
Signature · 6 lines
2.16.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/10 drm/i915/psr/cnl: Enable Y-coordinate support in source
In reply to José Roberto de SouzaFrom: "Souza, Jose" <[email protected]>
For Geminilake and Cannonlake+ the Y-coordinate support must be enabled in PSR2_CTL too.
Spec: 7713 and 7720
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_psr.c | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -4052,6 +4052,8 @@ enum {#define EDP_PSR2_CTL _MMIO(0x6f900)#define EDP_PSR2_ENABLE (1<<31)#define EDP_SU_TRACK_ENABLE (1<<30) +#define EDP_Y_COORDINATE_VALID (1<<26)/* GLK and CNL+ */ +#define EDP_Y_COORDINATE_ENABLE (1<<25)/* GLK and CNL+ */ #define EDP_MAX_SU_DISABLE_TIME (t) ((t)<<20)#define EDP_MAX_SU_DISABLE_TIME_MASK (0x1f<<20)#define EDP_PSR2_TP2_TIME_500 (0<<8)
@@ -7058,6 +7060,7 @@ enum {#define CHICKEN_TRANS_A 0x420c0#define CHICKEN_TRANS_B 0x420c4#define CHICKEN_TRANS (trans) _MMIO_TRANS(trans, CHICKEN_TRANS_A, CHICKEN_TRANS_B) +#define VSC_DATA_SEL_SOFTWARE_CONTROL (1<<25)/* GLK and CNL+ */ #define DDI_TRAINING_OVERRIDE_ENABLE (1<<19)#define DDI_TRAINING_OVERRIDE_VALUE (1<<18)#define DDIE_TRAINING_OVERRIDE_ENABLE (1<<17)/* CHICKEN_TRANS_A only */
drivers/gpu/drm/i915/intel_psr.c +12 -4
@@ -386,8 +386,10 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)/* 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 (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) { + val |=EDP_Y_COORDINATE_VALID |EDP_Y_COORDINATE_ENABLE ; + } if (drm_dp_dpcd_readb(&intel_dp->aux, DP_SYNCHRONIZATION_LATENCY_IN_SINK,
@@ -569,8 +571,14 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp,hsw_psr_setup_aux (intel_dp);if (dev_priv->psr.psr2_support) { -u32 chicken =PSR2_VSC_ENABLE_PROG_HEADER - |PSR2_ADD_VERTICAL_LINE_COUNT ; +u32 chicken =I915_READ (CHICKEN_TRANS (cpu_transcoder)); + +if (INTEL_GEN (dev_priv) ==9 && !IS_GEMINILAKE (dev_priv)) + chicken |= (PSR2_VSC_ENABLE_PROG_HEADER + |PSR2_ADD_VERTICAL_LINE_COUNT ); + +else + chicken &= ~VSC_DATA_SEL_SOFTWARE_CONTROL ;I915_WRITE (CHICKEN_TRANS (cpu_transcoder), chicken); I915_WRITE(EDP_PSR_DEBUG,
Signature · 6 lines
2.16.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/10 drm/i915/psr: Do not override PSR2 sink support
In reply to José Roberto de SouzaSink can support our PSR2 requirements but userspace can request a resolution that PSR2 hardware do not support, in this case it was overwritten the PSR2 sink support.
Adding another flag here, this way if requested resolution changed to a value that PSR2 hardware can handle, PSR2 can be enabled.
--- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/intel_psr.c | 33 +++++++++++++++++---------------- 3 files changed, 21 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -2
@@ -2630,7 +2630,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data) yesno(work_busy(&dev_priv->psr.work.work)));if (HAS_DDI (dev_priv)) { -if (dev_priv->psr.psr2_support) +if (dev_priv->psr.psr2_enabled) enabled =I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ;else enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ;
@@ -2678,7 +2678,7 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"Performance_Counter: %u\n" , psrperf); } -if (dev_priv->psr.psr2_support) { +if (dev_priv->psr.psr2_enabled) {u32 psr2 =I915_READ (EDP_PSR2_STATUS ); seq_printf(m, "EDP_PSR2_STATUS: %x [%s]\n",
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -602,11 +602,12 @@ struct i915_psr {bool active;struct delayed_work work;unsigned busy_frontbuffer_bits; -bool psr2_support; +bool sink_psr2_support;bool link_standby;bool colorimetry_support;bool alpm;bool has_hw_tracking; +bool psr2_enabled;void (*enable_source)(struct intel_dp *,const struct intel_crtc_state *);
drivers/gpu/drm/i915/intel_psr.c +17 -16
@@ -148,11 +148,12 @@ void intel_psr_init_dpcd(struct intel_dp *intel_dp)* Y-coordinate requirement panels we would need to enable * GTC first. */ - dev_priv->psr.psr2_support =intel_dp_get_y_coord_required (intel_dp); -DRM_DEBUG_KMS ("PSR2 %s on sink" , - dev_priv->psr.psr2_support ?"supported" :"not supported" ); + dev_priv->psr.sink_psr2_support = +intel_dp_get_y_coord_required (intel_dp); +DRM_DEBUG_KMS ("PSR2 %s on sink" , dev_priv->psr.sink_psr2_support + ?"supported" :"not supported" ); -if (dev_priv->psr.psr2_support) { +if (dev_priv->psr.sink_psr2_support) { dev_priv->psr.colorimetry_support =intel_dp_get_colorimetry_status (intel_dp); dev_priv->psr.alpm =
@@ -193,7 +194,7 @@ static void hsw_psr_setup_vsc(struct intel_dp *intel_dp,struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev);struct edp_vsc_psr psr_vsc; -if (dev_priv->psr.psr2_support) { +if (dev_priv->psr.psr2_enabled) {/* Prepare VSC Header for SU as per EDP 1.4 spec, Table 6.11 */ memset (&psr_vsc,0 ,sizeof (psr_vsc)); psr_vsc.sdp_header.HB0 =0 ;
@@ -265,7 +266,7 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv =to_i915 (dev);/* Enable ALPM at sink for psr2 */ -if (dev_priv->psr.psr2_support && dev_priv->psr.alpm) +if (dev_priv->psr.psr2_enabled && dev_priv->psr.alpm)drm_dp_dpcd_writeb (&intel_dp->aux,DP_RECEIVER_ALPM_CONFIG ,DP_ALPM_ENABLE );
@@ -424,7 +425,7 @@ static void hsw_psr_activate(struct intel_dp *intel_dp)*/ /* psr1 and psr2 are mutually exclusive.*/ -if (dev_priv->psr.psr2_support) +if (dev_priv->psr.psr2_enabled)hsw_activate_psr2 (intel_dp);else hsw_activate_psr1 (intel_dp);
@@ -444,7 +445,7 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,* dynamically during PSR enable, and extracted from sink * caps during eDP detection. */ -if (!dev_priv->psr.psr2_support) +if (!dev_priv->psr.sink_psr2_support)return false;if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) {
@@ -543,7 +544,7 @@ 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); -if (dev_priv->psr.psr2_support) +if (dev_priv->psr.psr2_enabled)WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE );else WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE );
@@ -570,7 +571,7 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp,if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv))hsw_psr_setup_aux (intel_dp); -if (dev_priv->psr.psr2_support) { +if (dev_priv->psr.psr2_enabled) {u32 chicken =I915_READ (CHICKEN_TRANS (cpu_transcoder));if (INTEL_GEN (dev_priv) ==9 && !IS_GEMINILAKE (dev_priv))
@@ -629,7 +630,7 @@ void intel_psr_enable(struct intel_dp *intel_dp, goto unlock; } - dev_priv->psr.psr2_support = crtc_state->has_psr2; + dev_priv->psr.psr2_enabled = crtc_state->has_psr2; dev_priv->psr.busy_frontbuffer_bits =0 ; dev_priv->psr.setup_vsc (intel_dp, crtc_state);
@@ -699,7 +700,7 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,i915_reg_t psr_status;u32 psr_status_mask; -if (dev_priv->psr.psr2_support) { +if (dev_priv->psr.psr2_enabled) { psr_status =EDP_PSR2_STATUS ; psr_status_mask =EDP_PSR2_STATUS_STATE_MASK ;
@@ -723,7 +724,7 @@ static void hsw_psr_disable(struct intel_dp *intel_dp, dev_priv->psr.active = false; }else { -if (dev_priv->psr.psr2_support) +if (dev_priv->psr.psr2_enabled)WARN_ON (I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE );else WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE );
@@ -783,7 +784,7 @@ static void intel_psr_work(struct work_struct *work)* and be ready for re-enable. */ if (HAS_DDI (dev_priv)) { -if (dev_priv->psr.psr2_support) { +if (dev_priv->psr.psr2_enabled) { if (intel_wait_for_register(dev_priv, EDP_PSR2_STATUS, EDP_PSR2_STATUS_STATE_MASK,
@@ -842,7 +843,7 @@ static void intel_psr_exit(struct drm_i915_private *dev_priv)return ;if (HAS_DDI (dev_priv)) { -if (dev_priv->psr.psr2_support) { +if (dev_priv->psr.psr2_enabled) { val =I915_READ (EDP_PSR2_CTL );WARN_ON (!(val &EDP_PSR2_ENABLE ));I915_WRITE (EDP_PSR2_CTL , val & ~EDP_PSR2_ENABLE );
@@ -1011,7 +1012,7 @@ void intel_psr_flush(struct drm_i915_private *dev_priv,/* By definition flush = invalidate + flush */ if (frontbuffer_bits) { -if (dev_priv->psr.psr2_support || +if (dev_priv->psr.psr2_enabled ||IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {intel_psr_exit (dev_priv); }else {
Signature · 6 lines
2.16.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/10 drm/i915/psr: Use PSR2 macro for PSR2
In reply to José Roberto de SouzaCosmetic change.
--- drivers/gpu/drm/i915/i915_reg.h | 3 ++- drivers/gpu/drm/i915/intel_psr.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +2 -1
@@ -4063,8 +4063,9 @@ enum {#define EDP_PSR2_TP2_TIME_MASK (3<<8)#define EDP_PSR2_FRAME_BEFORE_SU_SHIFT 4#define EDP_PSR2_FRAME_BEFORE_SU_MASK (0xf<<4) -#define EDP_PSR2_IDLE_MASK 0xf#define EDP_PSR2_FRAME_BEFORE_SU (a) ((a)<<4) +#define EDP_PSR2_IDLE_FRAME_MASK 0xf +#define EDP_PSR2_IDLE_FRAME_SHIFT 0#define EDP_PSR2_STATUS _MMIO(0x6f940)#define EDP_PSR2_STATUS_STATE_MASK (0xf<<28)
drivers/gpu/drm/i915/intel_psr.c +1 -1
@@ -382,7 +382,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)uint32_t val;uint8_t sink_latency; - val = idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT ; + val = idle_frames <<EDP_PSR2_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
Signature · 6 lines
2.16.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 8/10 drm/i915/psr: Cache sink synchronization latency
In reply to José Roberto de SouzaThis value do not change overtime so better cache it than fetch it every PSR enable.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_psr.c | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -608,6 +608,7 @@ struct i915_psr {bool alpm;bool has_hw_tracking;bool psr2_enabled; +u8 sink_sync_latency;void (*enable_source)(struct intel_dp *,const struct intel_crtc_state *);
drivers/gpu/drm/i915/intel_psr.c +16 -12
@@ -122,6 +122,18 @@ static bool intel_dp_get_alpm_status(struct intel_dp *intel_dp)return alpm_caps &DP_ALPM_CAP ; } +static u8 intel_dp_get_sink_sync_latency (struct intel_dp *intel_dp) +{ +u8 val =0 ; + +if (drm_dp_dpcd_readb (&intel_dp->aux, +DP_SYNCHRONIZATION_LATENCY_IN_SINK , &val) ==1 ) + val &=DP_MAX_RESYNC_FRAME_COUNT_MASK ; +else +DRM_ERROR ("Unable to get sink synchronization latency\n" ); +return val; +} +void intel_psr_init_dpcd (struct intel_dp *intel_dp) { struct drm_i915_private *dev_priv =
@@ -158,6 +170,8 @@ void intel_psr_init_dpcd(struct intel_dp *intel_dp)intel_dp_get_colorimetry_status (intel_dp); dev_priv->psr.alpm =intel_dp_get_alpm_status (intel_dp); + dev_priv->psr.sink_sync_latency = +intel_dp_get_sink_sync_latency (intel_dp); } } }
@@ -379,10 +393,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)* with the 5 or 6 idle patterns. */ uint32_t idle_frames =max (6 , dev_priv->vbt.psr.idle_frames); -uint32_t val; -uint8_t sink_latency; - - val = idle_frames <<EDP_PSR2_IDLE_FRAME_SHIFT ; +u32 val = idle_frames <<EDP_PSR2_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
@@ -392,14 +403,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp) val |=EDP_Y_COORDINATE_VALID |EDP_Y_COORDINATE_ENABLE ; } -if (drm_dp_dpcd_readb (&intel_dp->aux, -DP_SYNCHRONIZATION_LATENCY_IN_SINK , - &sink_latency) ==1 ) { - sink_latency &=DP_MAX_RESYNC_FRAME_COUNT_MASK ; - }else { - sink_latency =0 ; - } - val |=EDP_PSR2_FRAME_BEFORE_SU (sink_latency +1 ); + val |=EDP_PSR2_FRAME_BEFORE_SU (dev_priv->psr.sink_sync_latency +1 );if (dev_priv->vbt.psr.tp2_tp3_wakeup_time >5 ) val |=EDP_PSR2_TP2_TIME_2500 ;
Signature · 6 lines
2.16.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 9/10 drm/i915/psr: Set DPCD PSR2 enable bit when needed
In reply to José Roberto de SouzaIn the 2 eDP1.4a pannels tested set or not set bit have no effect but is better set it and comply with specification.
--- drivers/gpu/drm/i915/intel_psr.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_psr.c +6 -5
@@ -278,18 +278,19 @@ static void hsw_psr_enable_sink(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); +u8 dpcd_val =DP_PSR_ENABLE ;/* Enable ALPM at sink for psr2 */ if (dev_priv->psr.psr2_enabled && dev_priv->psr.alpm)drm_dp_dpcd_writeb (&intel_dp->aux,DP_RECEIVER_ALPM_CONFIG ,DP_ALPM_ENABLE ); + +if (dev_priv->psr.psr2_enabled) + dpcd_val |=DP_PSR_ENABLE_PSR2 ;if (dev_priv->psr.link_standby) -drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG , -DP_PSR_ENABLE |DP_PSR_MAIN_LINK_ACTIVE ); -else -drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG , -DP_PSR_ENABLE ); + dpcd_val |=DP_PSR_MAIN_LINK_ACTIVE ; +drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG , dpcd_val);drm_dp_dpcd_writeb (&intel_dp->aux,DP_SET_POWER ,DP_SET_POWER_D0 ); }
Signature · 6 lines
2.16.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 10/10 drm/i915/debugfs: Print sink PSR status
In reply to José Roberto de SouzaIGT tests could be improved with sink status, knowing for sure that hardware have activate or exit PSR.
--- drivers/gpu/drm/i915/i915_debugfs.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +29 -0
@@ -2603,6 +2603,26 @@ static const char *psr2_live_status(u32 val)return "unknown" ; } +static const char *psr_sink_self_refresh_status (u8 val) +{ +static const char *const sink_status[] = { +"inactive" , +"transitioning to active" , +"active" , +"active receiving selective update" , +"transitioning to inactive" , +"reserved" , +"reserved" , +"sink internal error" + }; + + val &=DP_PSR_SINK_STATE_MASK ; +if (val <ARRAY_SIZE (sink_status)) +return sink_status[val]; + +return "unknown" ; +} +static int i915_edp_psr_status (struct seq_file *m,void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);
@@ -2684,6 +2704,15 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"EDP_PSR2_STATUS: %x [%s]\n" , psr2,psr2_live_status (psr2)); } + +if (dev_priv->psr.enabled) { +struct drm_dp_aux *aux = &dev_priv->psr.enabled->aux; +u8 val; + +if (drm_dp_dpcd_readb (aux,DP_PSR_STATUS , &val) ==1 ) +seq_printf (m,"Sink self refresh status: 0x%x [%s]\n" , + val,psr_sink_self_refresh_status (val)); + }mutex_unlock (&dev_priv->psr.lock);intel_runtime_pm_put (dev_priv);
Signature · 6 lines
2.16.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for series starting with [v2,01/10] drm: Add DP PSR2 sink enable bit
In reply to José Roberto de Souza== Series Details ==
== Series Details ==
Series: series starting with [v2,01/10] drm: Add DP PSR2 sink enable bit
URL : https://patchwork.freedesktop.org/series/40702/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
38150dd0cc54 drm: Add DP PSR2 sink enable bit
b58a3e8a7618 drm: Add DP last received PSR SDP VSC register and bits
99b23cf0dceb drm/i915/psr: Nuke aux frame sync
42e34d55f628 drm/i915/psr: Tie PSR2 support to Y coordinate requirement
3c0441b04e7a drm/i915/psr/cnl: Enable Y-coordinate support in source
-:26: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV)
#26: FILE: drivers/gpu/drm/i915/i915_reg.h:4055:
+#define EDP_Y_COORDINATE_VALID (1<<26) /* GLK and CNL+ */
^-:27: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #27: FILE: drivers/gpu/drm/i915/i915_reg.h:4056:
+#define EDP_Y_COORDINATE_ENABLE (1<<25) /* GLK and CNL+ */
^
-:35: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #35: FILE: drivers/gpu/drm/i915/i915_reg.h:7063:
+#define VSC_DATA_SEL_SOFTWARE_CONTROL (1<<25) /* GLK and CNL+ */
^
total: 0 errors, 0 warnings, 3 checks, 43 lines checked b758759a05ee drm/i915/psr: Do not override PSR2 sink support 8d70d650ad61 drm/i915/psr: Use PSR2 macro for PSR2 d64ec6a72ea0 drm/i915/psr: Cache sink synchronization latency c7f3ff827a03 drm/i915/psr: Set DPCD PSR2 enable bit when needed d816dbeca7de drm/i915/debugfs: Print sink PSR status
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v2,01/10] drm: Add DP PSR2 sink enable bit
In reply to José Roberto de Souza== Series Details ==
== Series Details ==
Series: series starting with [v2,01/10] drm: Add DP PSR2 sink enable bit
URL : https://patchwork.freedesktop.org/series/40702/
State : success
== Summary ==
Series 40702v1 series starting with [v2,01/10] drm: Add DP PSR2 sink enable bit
https://patchwork.freedesktop.org/api/1.0/series/40702/revisions/1/mbox/
fi-bdw-5557u total:285 pass:264 dwarn:0 dfail:0 fail:0 skip:21 time:440s fi-bdw-gvtdvm total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:443s fi-blb-e6850 total:285 pass:220 dwarn:1 dfail:0 fail:0 skip:64 time:379s fi-bsw-n3050 total:285 pass:239 dwarn:0 dfail:0 fail:0 skip:46 time:540s fi-bwr-2160 total:285 pass:180 dwarn:0 dfail:0 fail:0 skip:105 time:298s fi-bxt-dsi total:285 pass:255 dwarn:0 dfail:0 fail:0 skip:30 time:514s fi-bxt-j4205 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:514s fi-byt-j1900 total:285 pass:250 dwarn:0 dfail:0 fail:0 skip:35 time:523s fi-cfl-8700k total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:413s fi-cfl-u total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:513s fi-cnl-y3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:592s fi-elk-e7500 total:285 pass:225 dwarn:1 dfail:0 fail:0 skip:59 time:424s fi-gdg-551 total:285 pass:176 dwarn:0 dfail:0 fail:1 skip:108 time:321s fi-ivb-3520m total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:466s fi-ivb-3770 total:285 pass:252 dwarn:0 dfail:0 fail:0 skip:33 time:435s fi-kbl-7500u total:285 pass:260 dwarn:1 dfail:0 fail:0 skip:24 time:477s fi-kbl-7567u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:471s fi-kbl-r total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:516s fi-pnv-d510 total:285 pass:219 dwarn:1 dfail:0 fail:0 skip:65 time:658s fi-skl-6260u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:443s fi-skl-6600u total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:553s fi-skl-6770hq total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:510s fi-skl-guc total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:429s fi-skl-gvtdvm total:285 pass:262 dwarn:0 dfail:0 fail:0 skip:23 time:449s fi-snb-2520m total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:586s fi-snb-2600 total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:402s Blacklisted hosts: fi-cfl-s3 total:285 pass:258 dwarn:0 dfail:0 fail:1 skip:26 time:565s fi-cnl-psr total:224 pass:198 dwarn:0 dfail:0 fail:1 skip:24 fi-glk-j4005 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:485s
d439f4eca05fe48c26bf9c3863e56ee19ac1c50b drm-tip: 2018y-03m-27d-00h-15m-56s UTC integration manifest d816dbeca7de drm/i915/debugfs: Print sink PSR statusc7f3ff827a03 drm/i915/psr: Set DPCD PSR2 enable bit when neededd64ec6a72ea0 drm/i915/psr: Cache sink synchronization latency8d70d650ad61 drm/i915/psr: Use PSR2 macro for PSR2b758759a05ee drm/i915/psr: Do not override PSR2 sink support3c0441b04e7a drm/i915/psr/cnl: Enable Y-coordinate support in source42e34d55f628 drm/i915/psr: Tie PSR2 support to Y coordinate requirement99b23cf0dceb drm/i915/psr: Nuke aux frame syncb58a3e8a7618 drm: Add DP last received PSR SDP VSC register and bits38150dd0cc54 drm: Add DP PSR2 sink enable bit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8496/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [v2,01/10] drm: Add DP PSR2 sink enable bit
In reply to José Roberto de Souza== Series Details ==
== Series Details ==
Series: series starting with [v2,01/10] drm: Add DP PSR2 sink enable bit
URL : https://patchwork.freedesktop.org/series/40702/
State : success
== Summary ==
---- Known issues:
Test kms_flip:
Subgroup flip-vs-expired-vblank:
pass -> FAIL (shard-hsw) fdo#102887
Subgroup modeset-vs-vblank-race:
pass -> FAIL (shard-hsw) fdo#103060
Subgroup plain-flip-ts-check-interruptible:
pass -> FAIL (shard-hsw) fdo#100368 +1
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-mmap-gtt:
pass -> DMESG-FAIL (shard-apl) fdo#103167 +1
Subgroup fbc-1p-offscren-pri-shrfb-draw-render:
pass -> FAIL (shard-apl) fdo#105685
Test kms_rotation_crc:
Subgroup sprite-rotation-180:
fail -> PASS (shard-apl) fdo#103925fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#105685 https://bugs.freedesktop.org/show_bug.cgi?id=105685
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
shard-apl total:3495 pass:1828 dwarn:1 dfail:1 fail:9 skip:1655 time:12937s shard-hsw total:3495 pass:1779 dwarn:1 dfail:0 fail:5 skip:1709 time:11549s shard-snb total:3495 pass:1374 dwarn:1 dfail:0 fail:3 skip:2117 time:7004s
Blacklisted hosts:
shard-kbl total:3495 pass:1954 dwarn:1 dfail:1 fail:10 skip:1529 time:9759s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8496/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx