drm/i915/skl: Enabling PSR2 SU with frame sync
Subsystems (2)
PATCH 1/1 drm/i915/skl: Enabling PSR2 SU with frame sync
We make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
--- drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_psr.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 61 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +14 -0
@@ -2745,6 +2745,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_250 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100
drivers/gpu/drm/i915/intel_dp.c +16 -0
@@ -3786,6 +3786,22 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + +if (INTEL_INFO (dev)->gen >=9 && + (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); +/* PSR2 needs frame sync as well */ +if (frame_sync_cap) { +DRM_DEBUG_KMS ("PSR2 supported on sink" ); + intel_dp->psr2_support = true; + }else + intel_dp->psr2_support = false; + } }/* Training Pattern 3 support, both source and sink */
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -663,6 +663,8 @@ struct intel_dp {struct intel_dp_mst_encoder *mst_encoders[I915_MAX_PIPES ];struct drm_dp_mst_topology_mgr mst_mgr; +bool psr2_support; +uint32_t (*get_aux_clock_divider)(struct intel_dp *dp,int index);/* * This function returns the value we have to program the AUX_CTL
drivers/gpu/drm/i915/intel_psr.c +29 -1
@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;
@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* Enable AUX frame sync at sink */ +if (intel_dp->psr2_support) +drm_dp_dpcd_writeb (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF , +DP_AUX_FRAME_SYNC_ENABLE ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?
@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,
@@ -255,6 +276,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +if (intel_dp->psr2_support) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)
@@ -364,6 +389,9 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {hsw_psr_setup_vsc (intel_dp); +if (intel_dp->psr2_support) +skl_psr_setup_su_vsc (intel_dp); +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP );
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6014 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -1 274/274 273/274
ILK 303/303 303/303 SNB 303/303 303/303 IVB -2 342/342 340/342 BYT 287/287 287/287 HSW 362/362 362/362 BDW 308/308 308/308 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied *PNV igt_gen3_render_linear_blits PASS(2) CRASH(1)PASS(1) *IVB igt_gem_pwrite_pread_snooped-copy-performance PASS(2) DMESG_WARN(2) *IVB igt_gem_storedw_batches_loop_secure-dispatch PASS(2) DMESG_WARN(1)PASS(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerQuoted 2 lines · Sonika Jindal
We make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
Before enabling HW tracking for PSR2 I'd like to know if all known bad cases of bad HW tracking verification now works well. Shouldn't we also remove all masks to be sure?
But yeah, or that or we need to create an interface probably using ioctl to userspace select the partial area to be updated.
I prefer HW tracking but I just want to be sure we aren't breaking the world. So I would start checking KDE behaviour, login screens, fbcon, xterm, etc.
But also this patch doesnt' change to use HW tracking, but anyway we start to add the support what is cool already.
Quoted 40 lines
Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_psr.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 61 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +14
-0@@ -2745,6 +2745,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_250 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100drivers/gpu/drm/i915/intel_dp.c +0
-0@@ -3786,6 +3786,22 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;
drivers/gpu/drm/i915/intel_dp.c intel_dp_get_dpcd(struct intel_dp *intel_dp) · line 3796
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +8
-0DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + +if (INTEL_INFO (dev)->gen >=9 && + (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; + intel_dp_dpcd_read_wake(&intel_dp->aux, + DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP,
Shouldn't we verify if it eDP 1.4 before reading this register that didn't existed previously?
drivers/gpu/drm/i915/intel_dp.c intel_dp_get_dpcd(struct intel_dp *intel_dp) · line 3798
Quoted 2 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0+ &frame_sync_cap, 1); +/* PSR2 needs frame sync as well */
But anyway, this frame sync cap was created and added for PSR2 so isn't DP_PSR2_IS_SUPPORTED already a supper seed and enough?
In the case they are really independent we could track with different variable and use that when writing DP_AUX_FRAME_SYNC_ENABLE.
Quoted 14 lines
drivers/gpu/drm/i915/intel_dp.c +6
-0+if (frame_sync_cap) { +DRM_DEBUG_KMS ("PSR2 supported on sink" ); + intel_dp->psr2_support = true; + }else + intel_dp->psr2_support = false; + } }/* Training Pattern 3 support, both source and sink */ drivers/gpu/drm/i915/intel_drv.h +0
-0
drivers/gpu/drm/i915/intel_drv.h struct intel_dp { · line 666
Quoted 4 lines
drivers/gpu/drm/i915/intel_drv.h +1
-0@@ -663,6 +663,8 @@ struct intel_dp {struct intel_dp_mst_encoder *mst_encoders[I915_MAX_PIPES ];struct drm_dp_mst_topology_mgr mst_mgr; +bool psr2_support;
Please move this to psr structure.
Quoted 65 lines
drivers/gpu/drm/i915/intel_drv.h +1
-0+uint32_t (*get_aux_clock_divider)(struct intel_dp *dp,int index);/* * This function returns the value we have to program the AUX_CTL drivers/gpu/drm/i915/intel_psr.c +26
-1@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* Enable AUX frame sync at sink */ +if (intel_dp->psr2_support) +drm_dp_dpcd_writeb (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF , +DP_AUX_FRAME_SYNC_ENABLE ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,@@ -255,6 +276,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +if (intel_dp->psr2_support) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)
drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 397
Quoted 9 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -364,6 +389,9 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {hsw_psr_setup_vsc (intel_dp); +if (intel_dp->psr2_support) +skl_psr_setup_su_vsc (intel_dp); +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP );
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Rodrigo
Quoted 2 lines · Sonika Jindal
We make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
Before enabling HW tracking for PSR2 I'd like to know if all known bad cases of bad HW tracking verification now works well. Shouldn't we also remove all masks to be sure?
But yeah, or that or we need to create an interface probably using ioctl to userspace select the partial area to be updated.
Quoted 6 lines
I prefer HW tracking but I just want to be sure we aren't breaking the world. So I would start checking KDE behaviour, login screens, fbcon, xterm, etc.
But also this patch doesnt' change to use HW tracking, but anyway we start to add the support what is cool already.
Yes, since with this patch we are not interrupting the PSR functionality and with PSR's SW tracking being there, this will not really affect.
For SW tracking with PSR2, we don't have any clear way as per bspec to supply rectangles. Besides, its a better idea to just let it have it this way until we can really try it out on PSR2 panels.
So, HW tracking for PSR2 as of now which should be fine because for any screen update we anyways will be doing PSR exits. For some small updates, if we miss I am hoping that PSR2's HW tracking will take care :)
Since, we don't still have any panel which support PSR2, I have not given it a try yet.
Quoted 43 lines
Quoted 43 lines
Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_psr.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 61 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +14
-0@@ -2745,6 +2745,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_250 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100drivers/gpu/drm/i915/intel_dp.c +2
-0@@ -3786,6 +3786,22 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + + if (INTEL_INFO(dev)->gen >= 9 &&
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c intel_dp_get_dpcd(struct intel_dp *intel_dp) · line 3796
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +6
-0+ (intel_dp->psr_dpcd[0] & DP_PSR2_IS_SUPPORTED)) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; + intel_dp_dpcd_read_wake(&intel_dp->aux, + DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP,Shouldn't we verify if it eDP 1.4 before reading this register that didn't existed previously?
Not required. This register (0070h PSR caps) always existed with 0 and 1 values. Value 2 (DP_PSR2_IS_SUPPORTED) was introduced in edp1.4.
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c intel_dp_get_dpcd(struct intel_dp *intel_dp) · line 3798
Quoted 2 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0+ &frame_sync_cap, 1); +/* PSR2 needs frame sync as well */ But anyway, this frame sync cap was created and added for PSR2 so isn't
DP_PSR2_IS_SUPPORTEDalready a supper seed and enough?
No, frame sync is not just for PSR2. It is there for general AV sync "during periods of temporary video stream inactivity on main-link". Other usages might be added in future versions.
Quoted 3 lines
In the case they are really independent we could track with different variable and use that when writing
DP_AUX_FRAME_SYNC_ENABLE.
Hmm, we could do that too.
Quoted 17 lines
Quoted 17 lines
drivers/gpu/drm/i915/intel_dp.c +6
-0+if (frame_sync_cap) { +DRM_DEBUG_KMS ("PSR2 supported on sink" ); + intel_dp->psr2_support = true; + }else + intel_dp->psr2_support = false; + } }/* Training Pattern 3 support, both source and sink */ drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -663,6 +663,8 @@ struct intel_dp {struct intel_dp_mst_encoder *mst_encoders[I915_MAX_PIPES ];struct drm_dp_mst_topology_mgr mst_mgr;
Quoted 3 lines
drivers/gpu/drm/i915/intel_drv.h struct intel_dp { · line 666
Quoted 1 line
drivers/gpu/drm/i915/intel_drv.h +1
-0+bool psr2_support;Please move this to psr structure.
Makes sense.
Quoted 68 lines
Quoted 68 lines
drivers/gpu/drm/i915/intel_drv.h +1
-0+uint32_t (*get_aux_clock_divider)(struct intel_dp *dp,int index);/* * This function returns the value we have to program the AUX_CTL drivers/gpu/drm/i915/intel_psr.c +26
-1@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* Enable AUX frame sync at sink */ +if (intel_dp->psr2_support) +drm_dp_dpcd_writeb (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF , +DP_AUX_FRAME_SYNC_ENABLE ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,@@ -255,6 +276,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +if (intel_dp->psr2_support) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)@@ -364,6 +389,9 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {hsw_psr_setup_vsc (intel_dp);
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 397
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0+if (intel_dp->psr2_support) +skl_psr_setup_su_vsc (intel_dp); +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP );
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerHi Sonika,
on the previous email I forgot to tell that we also need to add somewhere a check to avoid PSR for resolutions bigger than 3200x2000.
Although most of displays that we have that support psr are 3200x1800 it is better to think a way to protect now than later.
Thanks,
Rodrigo.
Quoted 137 lines · Sonika Jindal
We make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_psr.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 61 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +14
-0@@ -2745,6 +2745,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_250 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100drivers/gpu/drm/i915/intel_dp.c +16
-0@@ -3786,6 +3786,22 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + +if (INTEL_INFO (dev)->gen >=9 && + (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); +/* PSR2 needs frame sync as well */ +if (frame_sync_cap) { +DRM_DEBUG_KMS ("PSR2 supported on sink" ); + intel_dp->psr2_support = true; + }else + intel_dp->psr2_support = false; + } }/* Training Pattern 3 support, both source and sink */ drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -663,6 +663,8 @@ struct intel_dp {struct intel_dp_mst_encoder *mst_encoders[I915_MAX_PIPES ];struct drm_dp_mst_topology_mgr mst_mgr; +bool psr2_support; +uint32_t (*get_aux_clock_divider)(struct intel_dp *dp,int index);/* * This function returns the value we have to program the AUX_CTL drivers/gpu/drm/i915/intel_psr.c +26
-1@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* Enable AUX frame sync at sink */ +if (intel_dp->psr2_support) +drm_dp_dpcd_writeb (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF , +DP_AUX_FRAME_SYNC_ENABLE ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,@@ -255,6 +276,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +if (intel_dp->psr2_support) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)
drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 397
Quoted 9 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -364,6 +389,9 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {hsw_psr_setup_vsc (intel_dp); +if (intel_dp->psr2_support) +skl_psr_setup_su_vsc (intel_dp); +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP );
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Rodrigo
Hi Sonika,
on the previous email I forgot to tell that we also need to add somewhere a check to avoid PSR for resolutions bigger than 3200x2000.
Yes, I will add that check before enabling PSR2.
Quoted 147 lines
Although most of displays that we have that support psr are 3200x1800 it is better to think a way to protect now than later.
Thanks,
Rodrigo.Quoted 140 lines · Sonika Jindal
We make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_psr.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 61 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +14
-0@@ -2745,6 +2745,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_250 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100drivers/gpu/drm/i915/intel_dp.c +16
-0@@ -3786,6 +3786,22 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + +if (INTEL_INFO (dev)->gen >=9 && + (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); +/* PSR2 needs frame sync as well */ +if (frame_sync_cap) { +DRM_DEBUG_KMS ("PSR2 supported on sink" ); + intel_dp->psr2_support = true; + }else + intel_dp->psr2_support = false; + } }/* Training Pattern 3 support, both source and sink */ drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -663,6 +663,8 @@ struct intel_dp {struct intel_dp_mst_encoder *mst_encoders[I915_MAX_PIPES ];struct drm_dp_mst_topology_mgr mst_mgr; +bool psr2_support; +uint32_t (*get_aux_clock_divider)(struct intel_dp *dp,int index);/* * This function returns the value we have to program the AUX_CTL drivers/gpu/drm/i915/intel_psr.c +26
-1@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* Enable AUX frame sync at sink */ +if (intel_dp->psr2_support) +drm_dp_dpcd_writeb (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF , +DP_AUX_FRAME_SYNC_ENABLE ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,@@ -255,6 +276,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +if (intel_dp->psr2_support) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)@@ -364,6 +389,9 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {hsw_psr_setup_vsc (intel_dp);
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 397
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0+if (intel_dp->psr2_support) +skl_psr_setup_su_vsc (intel_dp); +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP );
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Rodrigo
Hi Sonika,
on the previous email I forgot to tell that we also need to add somewhere a check to avoid PSR for resolutions bigger than 3200x2000.
Although most of displays that we have that support psr are 3200x1800 it is better to think a way to protect now than later.
Is that a restriction just for PSR2 (because the hw doesn't have more space for line checksums) or also for the existing PSR code? If it's just for PSR2 we can easily extend the check Sonika is adding in this patch to also check for that and it's all done.
-Daniel
Quoted 128 lines
Thanks,
Rodrigo.Quoted 123 lines · Sonika Jindal
We make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_psr.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 61 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +14
-0@@ -2745,6 +2745,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_250 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100drivers/gpu/drm/i915/intel_dp.c +16
-0@@ -3786,6 +3786,22 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + +if (INTEL_INFO (dev)->gen >=9 && + (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); +/* PSR2 needs frame sync as well */ +if (frame_sync_cap) { +DRM_DEBUG_KMS ("PSR2 supported on sink" ); + intel_dp->psr2_support = true; + }else + intel_dp->psr2_support = false; + } }/* Training Pattern 3 support, both source and sink */ drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -663,6 +663,8 @@ struct intel_dp {struct intel_dp_mst_encoder *mst_encoders[I915_MAX_PIPES ];struct drm_dp_mst_topology_mgr mst_mgr; +bool psr2_support; +uint32_t (*get_aux_clock_divider)(struct intel_dp *dp,int index);/* * This function returns the value we have to program the AUX_CTL drivers/gpu/drm/i915/intel_psr.c +22
-1@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* Enable AUX frame sync at sink */ +if (intel_dp->psr2_support) +drm_dp_dpcd_writeb (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF , +DP_AUX_FRAME_SYNC_ENABLE ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val);
Quoted 8 lines
drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_enable_source(struct intel_dp *intel_dp) · line 280
Quoted 8 lines
drivers/gpu/drm/i915/intel_psr.c +2
-0}else { I915_WRITE(aux_ctl_reg,@@ -255,6 +276,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +if (intel_dp->psr2_support)
Well here I mean.
Cheers, Daniel
Quoted 20 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +2
-0+I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 397
Quoted 9 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -364,6 +389,9 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {hsw_psr_setup_vsc (intel_dp); +if (intel_dp->psr2_support) +skl_psr_setup_su_vsc (intel_dp); +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP );_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerQuoted 6 lines · Daniel Vetter
Quoted 5 lines · Rodrigo
Hi Sonika,
on the previous email I forgot to tell that we also need to add somewhere a check to avoid PSR for resolutions bigger than 3200x2000.
Quoted 7 lines
Quoted 2 lines
Although most of displays that we have that support psr are 3200x1800 it is better to think a way to protect now than later.
Is that a restriction just for PSR2 (because the hw doesn't have more space for line checksums) or also for the existing PSR code? If it's just for PSR2 we can easily extend the check Sonika is adding in this patch to also check for that and it's all done.
Spec just list this limitation on PSR2.
Quoted 132 lines
-Daniel
Quoted 130 lines
Thanks,
Rodrigo.Quoted 125 lines · Sonika Jindal
We make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
Signed-off-by Sonika Jindal <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_psr.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 61 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_reg.h +14
-0@@ -2745,6 +2745,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_250 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100drivers/gpu/drm/i915/intel_dp.c +16
-0@@ -3786,6 +3786,22 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + +if (INTEL_INFO (dev)->gen >=9 && + (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); +/* PSR2 needs frame sync as well */ +if (frame_sync_cap) { +DRM_DEBUG_KMS ("PSR2 supported on sink" ); + intel_dp->psr2_support = true; + }else + intel_dp->psr2_support = false; + } }/* Training Pattern 3 support, both source and sink */ drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -663,6 +663,8 @@ struct intel_dp {struct intel_dp_mst_encoder *mst_encoders[I915_MAX_PIPES ];struct drm_dp_mst_topology_mgr mst_mgr; +bool psr2_support; +uint32_t (*get_aux_clock_divider)(struct intel_dp *dp,int index);/* * This function returns the value we have to program the AUX_CTL drivers/gpu/drm/i915/intel_psr.c +22
-1@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* Enable AUX frame sync at sink */ +if (intel_dp->psr2_support) +drm_dp_dpcd_writeb (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF , +DP_AUX_FRAME_SYNC_ENABLE ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,
Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_enable_source(struct intel_dp *intel_dp) · line 280
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +2
-0@@ -255,6 +276,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +if (intel_dp->psr2_support)Well here I mean.
Agree.
Quoted 24 lines
Cheers, Daniel
Quoted 20 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +2
-0+I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 397
Quoted 9 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -364,6 +389,9 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {hsw_psr_setup_vsc (intel_dp); +if (intel_dp->psr2_support) +skl_psr_setup_su_vsc (intel_dp); +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP );_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/skl: Enabling PSR2 SU with frame sync
We make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
v2: Add 3200x2000 resolution restriction with PSR2, move psr2_support to i915_psr struct, add aux_frame_sync to independently control aux frame sync, rename the TP2 TIME macro for 2500us (Rodrigo, Siva)
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_psr.c | 34 +++++++++++++++++++++++++++++++++- 4 files changed, 64 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -879,6 +879,8 @@ struct i915_psr {struct delayed_work work;unsigned busy_frontbuffer_bits;bool link_standby; +bool psr2_support; +bool aux_frame_sync; };enum intel_pch {
drivers/gpu/drm/i915/i915_reg.h +14 -0
@@ -2745,6 +2745,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_2500 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100
drivers/gpu/drm/i915/intel_dp.c +15 -0
@@ -3786,6 +3786,21 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + +if (INTEL_INFO (dev)->gen >=9 && + (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); + dev_priv->psr.aux_frame_sync = frame_sync_cap ? true : false; +/* PSR2 needs frame sync as well */ + dev_priv->psr.psr2_support = dev_priv->psr.aux_frame_sync; +DRM_DEBUG_KMS ("PSR2 %s on sink" , + dev_priv->psr.psr2_support ?"supported" :"not supported" ); + } }/* Training Pattern 3 support, both source and sink */
drivers/gpu/drm/i915/intel_psr.c +33 -1
@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;
@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* 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 ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?
@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,
@@ -232,6 +253,8 @@ 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 = dev->dev_private; +struct intel_crtc *crtc =to_intel_crtc (dig_port->base.base.crtc); +uint32_t max_sleep_time =0x1f ;/* Lately it was identified that depending on panel idle frame count * calculated at HW can be off by 1. So let's use what came
@@ -255,6 +278,12 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ +if (dev_priv->psr.psr2_support && crtc->config->pipe_src_w <=3200 + && crtc->config->pipe_src_h <=2000 ) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)
@@ -364,6 +393,9 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {hsw_psr_setup_vsc (intel_dp); +if (dev_priv->psr.psr2_support) +skl_psr_setup_su_vsc (intel_dp); +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP );
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 145 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Sonika Jindal
Sent: Thursday, March 26, 2015 1:57 PM
To: [email protected]
Cc: Vivi, Rodrigo
Subject: [Intel-gfx] [PATCH] drm/i915/skl: Enabling PSR2 SU with frame syncWe make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
v2: Add 3200x2000 resolution restriction with PSR2, move
psr2_supporttoi915_psrstruct, addaux_frame_syncto independently control aux frame sync, rename the TP2 TIME macro for 2500us (Rodrigo, Siva)Signed-off-by Sonika Jindal <[email protected]>---
drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_psr.c | 34 +++++++++++++++++++++++++++++++++- 4 files changed, 64 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -879,6 +879,8 @@ struct i915_psr {struct delayed_work work;unsigned busy_frontbuffer_bits;bool link_standby; +bool psr2_support; +bool aux_frame_sync; };enum intel_pch {drivers/gpu/drm/i915/i915_reg.h +14
-0@@ -2745,6 +2745,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_2500 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100drivers/gpu/drm/i915/intel_dp.c +15
-0@@ -3786,6 +3786,21 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + +if (INTEL_INFO (dev)->gen >=9 && + (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); + dev_priv->psr.aux_frame_sync = frame_sync_cap ? true : false; +/* PSR2 needs frame sync as well */ + dev_priv->psr.psr2_support = dev_priv->psr.aux_frame_sync; +DRM_DEBUG_KMS ("PSR2 %s on sink" , + dev_priv->psr.psr2_support ?"supported" :"not supported" ); + } }/* Training Pattern 3 support, both source and sink */ drivers/gpu/drm/i915/intel_psr.c +24
-1@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* 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 ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,@@ -232,6 +253,8 @@ 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 = dev->dev_private; +struct intel_crtc *crtc =to_intel_crtc (dig_port->base.base.crtc); +uint32_t max_sleep_time =0x1f ;/* Lately it was identified that depending on panel idle frame count * calculated at HW can be off by 1. So let's use what came
drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_enable_source(struct intel_dp *intel_dp) · line 286
Quoted 9 lines
drivers/gpu/drm/i915/intel_psr.c +6
-0@@ -255,6 +278,12 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ +if (dev_priv->psr.psr2_support && crtc->config->pipe_src_w <=3200 + && crtc->config->pipe_src_h <=2000 ) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 );
Do we need this size check every time _enable() is called ? Or is it sufficient to do it once ?
Also, if this size restriction is not specific to HSW, isn't match_conditions() a better place for this check ?
Thanks,
Durga
Quoted 16 lines
drivers/gpu/drm/i915/intel_psr.c +3
-1}static bool intel_psr_match_conditions (struct intel_dp *intel_dp)@@ -364,6 +393,9 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {hsw_psr_setup_vsc (intel_dp); +if (dev_priv->psr.psr2_support) +skl_psr_setup_su_vsc (intel_dp); +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP ); --1.7.10.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 149 lines · Durgadoss
Quoted 149 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Sonika Jindal
Sent: Thursday, March 26, 2015 1:57 PM
To: [email protected]
Cc: Vivi, Rodrigo
Subject: [Intel-gfx] [PATCH] drm/i915/skl: Enabling PSR2 SU with frame syncWe make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
v2: Add 3200x2000 resolution restriction with PSR2, move
psr2_supporttoi915_psrstruct, addaux_frame_syncto independently control aux frame sync, rename the TP2 TIME macro for 2500us (Rodrigo, Siva)Signed-off-by Sonika Jindal <[email protected]>---
drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_psr.c | 34 +++++++++++++++++++++++++++++++++- 4 files changed, 64 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -879,6 +879,8 @@ struct i915_psr {struct delayed_work work;unsigned busy_frontbuffer_bits;bool link_standby; +bool psr2_support; +bool aux_frame_sync; };enum intel_pch {drivers/gpu/drm/i915/i915_reg.h +14
-0@@ -2745,6 +2745,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_2500 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100drivers/gpu/drm/i915/intel_dp.c +15
-0@@ -3786,6 +3786,21 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + +if (INTEL_INFO (dev)->gen >=9 && + (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); + dev_priv->psr.aux_frame_sync = frame_sync_cap ? true : false; +/* PSR2 needs frame sync as well */ + dev_priv->psr.psr2_support = dev_priv->psr.aux_frame_sync; +DRM_DEBUG_KMS ("PSR2 %s on sink" , + dev_priv->psr.psr2_support ?"supported" :"not supported" ); + } }/* Training Pattern 3 support, both source and sink */ drivers/gpu/drm/i915/intel_psr.c +25
-1@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* 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 ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,@@ -232,6 +253,8 @@ 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 = dev->dev_private; +struct intel_crtc *crtc =to_intel_crtc (dig_port->base.base.crtc); +uint32_t max_sleep_time =0x1f ;/* Lately it was identified that depending on panel idle frame count * calculated at HW can be off by 1. So let's use what came @@ -255,6 +278,12 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); +
Quoted 8 lines
drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_enable_source(struct intel_dp *intel_dp) · line 286
Quoted 5 lines
drivers/gpu/drm/i915/intel_psr.c +5
-0+/* PSR2 is restricted to work with panel resolutions upto 3200x2000 */ +if (dev_priv->psr.psr2_support && crtc->config->pipe_src_w <=3200 + && crtc->config->pipe_src_h <=2000 ) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 );Do we need this size check every time
_enable()is called ? Or is it sufficient to do it once ?
Yes, it is sufficient to check it once after the pipe is enabled. I will move it to intel_psr_enable which is called once, and send out a patch in a while.
Quoted 4 lines
Also, if this size restriction is not specific to HSW, isn't
match_conditions()a better place for this check ?
It is specific to psr2. In match_conditions we mainly check if psr support is possible. I think this check can remain in intel_psr_enable.
Quoted 19 lines
Thanks,
DurgaQuoted 16 lines
drivers/gpu/drm/i915/intel_psr.c +3
-1}static bool intel_psr_match_conditions (struct intel_dp *intel_dp)@@ -364,6 +393,9 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {hsw_psr_setup_vsc (intel_dp); +if (dev_priv->psr.psr2_support) +skl_psr_setup_su_vsc (intel_dp); +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP ); --1.7.10.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/skl: Enabling PSR2 SU with frame sync
We make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
v2: Add 3200x2000 resolution restriction with PSR2, move psr2_support to i915_psr struct, add aux_frame_sync to independently control aux frame sync, rename the TP2 TIME macro for 2500us (Rodrigo, Siva)
v3: Moving the resolution restriction to intel_psr_enable so that we check it only once(Durga)
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_psr.c | 38 +++++++++++++++++++++++++++++++++++++- 4 files changed, 68 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -879,6 +879,8 @@ struct i915_psr {struct delayed_work work;unsigned busy_frontbuffer_bits;bool link_standby; +bool psr2_support; +bool aux_frame_sync; };enum intel_pch {
drivers/gpu/drm/i915/i915_reg.h +14 -0
@@ -2745,6 +2745,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_2500 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100
drivers/gpu/drm/i915/intel_dp.c +15 -0
@@ -3786,6 +3786,21 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + +if (INTEL_INFO (dev)->gen >=9 && + (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); + dev_priv->psr.aux_frame_sync = frame_sync_cap ? true : false; +/* PSR2 needs frame sync as well */ + dev_priv->psr.psr2_support = dev_priv->psr.aux_frame_sync; +DRM_DEBUG_KMS ("PSR2 %s on sink" , + dev_priv->psr.psr2_support ?"supported" :"not supported" ); + } }/* Training Pattern 3 support, both source and sink */
drivers/gpu/drm/i915/intel_psr.c +37 -1
@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;
@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* 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 ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?
@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,
@@ -232,6 +253,7 @@ 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 = dev->dev_private; +uint32_t max_sleep_time =0x1f ;/* Lately it was identified that depending on panel idle frame count * calculated at HW can be off by 1. So let's use what came
@@ -255,6 +277,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +if (dev_priv->psr.psr2_support) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)
@@ -332,6 +358,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc);if (!HAS_PSR (dev)) {DRM_DEBUG_KMS ("PSR not supported on this platform\n" );
@@ -364,6 +391,15 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {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 || + crtc->config->pipe_src_h >2000 ) + dev_priv->psr.psr2_support = false; +else +skl_psr_setup_su_vsc (intel_dp); + } +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP );
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines
-----Original Message-----
From: Jindal, Sonika
Sent: Tuesday, March 31, 2015 11:29 AM
To: [email protected]
Cc: Jindal, Sonika; R, Durgadoss; Vivi, Rodrigo
Subject: [PATCH] drm/i915/skl: Enabling PSR2 SU with frame syncWe make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
Quoted 8 lines
v2: Add 3200x2000 resolution restriction with PSR2, move
psr2_supporttoi915_psrstruct, addaux_frame_syncto independently control aux frame sync, rename the TP2 TIME macro for 2500us (Rodrigo, Siva)
v3: Moving the resolution restriction tointel_psr_enableso that we check it only once(Durga)Cc Durgadoss R <[email protected]>Cc Rodrigo Vivi <[email protected]>
Thanks,
Durga
Quoted 165 lines
Signed-off-by Sonika Jindal <[email protected]>---
drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_psr.c | 38 +++++++++++++++++++++++++++++++++++++- 4 files changed, 68 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -879,6 +879,8 @@ struct i915_psr {struct delayed_work work;unsigned busy_frontbuffer_bits;bool link_standby; +bool psr2_support; +bool aux_frame_sync; };enum intel_pch {drivers/gpu/drm/i915/i915_reg.h +14
-0@@ -2745,6 +2745,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_2500 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100drivers/gpu/drm/i915/intel_dp.c +15
-0@@ -3786,6 +3786,21 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + +if (INTEL_INFO (dev)->gen >=9 && + (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); + dev_priv->psr.aux_frame_sync = frame_sync_cap ? true : false; +/* PSR2 needs frame sync as well */ + dev_priv->psr.psr2_support = dev_priv->psr.aux_frame_sync; +DRM_DEBUG_KMS ("PSR2 %s on sink" , + dev_priv->psr.psr2_support ?"supported" :"not supported" ); + } }/* Training Pattern 3 support, both source and sink */ drivers/gpu/drm/i915/intel_psr.c +37
-2@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* 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 ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,@@ -232,6 +253,7 @@ 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 = dev->dev_private; +uint32_t max_sleep_time =0x1f ;/* Lately it was identified that depending on panel idle frame count * calculated at HW can be off by 1. So let's use what came @@ -255,6 +277,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +if (dev_priv->psr.psr2_support) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)@@ -332,6 +358,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc);if (!HAS_PSR (dev)) {DRM_DEBUG_KMS ("PSR not supported on this platform\n" );@@ -364,6 +391,15 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {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 || + crtc->config->pipe_src_h >2000 ) + dev_priv->psr.psr2_support = false; +else +skl_psr_setup_su_vsc (intel_dp); + } +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP ); --
Quoted 1 line
1.7.10.4
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Sonika Jindal
We make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
v2: Add 3200x2000 resolution restriction with PSR2, move
psr2_supporttoi915_psrstruct, addaux_frame_syncto independently control aux frame sync, rename the TP2 TIME macro for 2500us (Rodrigo, Siva)
v3: Moving the resolution restriction tointel_psr_enableso that we check it only once(Durga)
Quoted 3 lines
Cc Durgadoss R <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Sonika Jindal <[email protected]>
Hm, I tried to apply this but there's conflicts. Do I miss a required patch? Can you please check that this applies cleanly on -nightly?
Thanks, Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/skl: Enabling PSR2 SU with frame sync
We make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
v2: Add 3200x2000 resolution restriction with PSR2, move psr2_support to i915_psr struct, add aux_frame_sync to independently control aux frame sync, rename the TP2 TIME macro for 2500us (Rodrigo, Siva)
v3: Moving the resolution restriction to intel_psr_enable so that we check it only once(Durga)
---
Hi Daniel,
It applies cleanly for me. Still I created new patch. Please try, if it works for you.
Regards,
Sonika
drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_psr.c | 38 +++++++++++++++++++++++++++++++++++++- 4 files changed, 68 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -881,6 +881,8 @@ struct i915_psr {struct delayed_work work;unsigned busy_frontbuffer_bits;bool link_standby; +bool psr2_support; +bool aux_frame_sync; };enum intel_pch {
drivers/gpu/drm/i915/i915_reg.h +14 -0
@@ -2748,6 +2748,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_2500 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100
drivers/gpu/drm/i915/intel_dp.c +15 -0
@@ -3785,6 +3785,21 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + +if (INTEL_INFO (dev)->gen >=9 && + (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); + dev_priv->psr.aux_frame_sync = frame_sync_cap ? true : false; +/* PSR2 needs frame sync as well */ + dev_priv->psr.psr2_support = dev_priv->psr.aux_frame_sync; +DRM_DEBUG_KMS ("PSR2 %s on sink" , + dev_priv->psr.psr2_support ?"supported" :"not supported" ); + } }/* Training Pattern 3 support, both source and sink */
drivers/gpu/drm/i915/intel_psr.c +37 -1
@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;
@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* 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 ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?
@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,
@@ -232,6 +253,7 @@ 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 = dev->dev_private; +uint32_t max_sleep_time =0x1f ;/* Lately it was identified that depending on panel idle frame count * calculated at HW can be off by 1. So let's use what came
@@ -255,6 +277,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +if (dev_priv->psr.psr2_support) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)
@@ -332,6 +358,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc);if (!HAS_PSR (dev)) {DRM_DEBUG_KMS ("PSR not supported on this platform\n" );
@@ -364,6 +391,15 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {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 || + crtc->config->pipe_src_h >2000 ) + dev_priv->psr.psr2_support = false; +else +skl_psr_setup_su_vsc (intel_dp); + } +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP );
Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6095 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -2 270/270 268/270 ILK -1 303/303 302/303 SNB 304/304 304/304 IVB 337/337 337/337 BYT 287/287 287/287 HSW 361/361 361/361 BDW 309/309 309/309 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied PNV igt@gem_userptr_blits@coherency-sync CRASH(5)PASS(2) CRASH(2) PNV igt@gem_tiled_pread_pwrite FAIL(1)PASS(4) FAIL(1)PASS(1) *ILK igt@kms_flip@blocking-absolute-wf_vblank-interruptible PASS(2) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:drm_edid_block_valid[drm]]*ERROR*EDID_checksum_is_invalid,remainder_is@EDID checksum is .* remainder is
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 13 lines · Sonika Jindal
We make use of HW tracking for Selective update region and enable frame sync on sink. We use hardware's hardcoded data values for frame sync and GTC.
v2: Add 3200x2000 resolution restriction with PSR2, move
psr2_supporttoi915_psrstruct, addaux_frame_syncto independently control aux frame sync, rename the TP2 TIME macro for 2500us (Rodrigo, Siva)
v3: Moving the resolution restriction tointel_psr_enableso that we check it only once(Durga)Cc Durgadoss R <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Sonika Jindal <[email protected]>Reviewed-by Durgadoss R <[email protected]>
Quoted 5 lines
---
Hi Daniel,It applies cleanly for me. Still I created new patch. Please try, if it works for you.
Yeah this one worked perfectly. Dunno what happened with the old one. Thanks for resending, applied to dinq.
-Daniel
Quoted 173 lines
Regards,
Sonikadrivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_reg.h | 14 ++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 15 +++++++++++++++ drivers/gpu/drm/i915/intel_psr.c | 38 +++++++++++++++++++++++++++++++++++++- 4 files changed, 68 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -881,6 +881,8 @@ struct i915_psr {struct delayed_work work;unsigned busy_frontbuffer_bits;bool link_standby; +bool psr2_support; +bool aux_frame_sync; };enum intel_pch {drivers/gpu/drm/i915/i915_reg.h +14
-0@@ -2748,6 +2748,20 @@ enum skl_disp_power_wells {#define EDP_PSR_DEBUG_MASK_MEMUP (1<<26)#define EDP_PSR_DEBUG_MASK_HPD (1<<25) +#define EDP_PSR2_CTL 0x6f900 +#define EDP_PSR2_ENABLE (1<<31) +#define EDP_SU_TRACK_ENABLE (1<<30) +#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) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_2500 (2<<8) +#define EDP_PSR2_TP2_TIME_50 (3<<8) +#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 +/* VGA port control */ #define ADPA 0x61100#define PCH_ADPA 0xe1100drivers/gpu/drm/i915/intel_dp.c +15
-0@@ -3785,6 +3785,21 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true;DRM_DEBUG_KMS ("Detected EDP PSR Panel.\n" ); } + +if (INTEL_INFO (dev)->gen >=9 && + (intel_dp->psr_dpcd[0 ] &DP_PSR2_IS_SUPPORTED )) { +uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); + dev_priv->psr.aux_frame_sync = frame_sync_cap ? true : false; +/* PSR2 needs frame sync as well */ + dev_priv->psr.psr2_support = dev_priv->psr.aux_frame_sync; +DRM_DEBUG_KMS ("PSR2 %s on sink" , + dev_priv->psr.psr2_support ?"supported" :"not supported" ); + } }/* Training Pattern 3 support, both source and sink */ drivers/gpu/drm/i915/intel_psr.c +37
-1@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* 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 ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,@@ -232,6 +253,7 @@ 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 = dev->dev_private; +uint32_t max_sleep_time =0x1f ;/* Lately it was identified that depending on panel idle frame count * calculated at HW can be off by 1. So let's use what came @@ -255,6 +277,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +if (dev_priv->psr.psr2_support) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)@@ -332,6 +358,7 @@ void intel_psr_enable(struct intel_dp *intel_dp)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv = dev->dev_private; +struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc);if (!HAS_PSR (dev)) {DRM_DEBUG_KMS ("PSR not supported on this platform\n" );@@ -364,6 +391,15 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {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 || + crtc->config->pipe_src_h >2000 ) + dev_priv->psr.psr2_support = false; +else +skl_psr_setup_su_vsc (intel_dp); + } +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP );Signature · 6 lines
1.7.10.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6095 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -2 270/270 268/270 ILK -1 303/303 302/303 SNB 304/304 304/304 IVB 337/337 337/337 BYT 287/287 287/287 HSW 361/361 361/361 BDW 309/309 309/309 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied PNV igt@gem_userptr_blits@coherency-sync CRASH(5)PASS(2) CRASH(2) PNV igt@gem_tiled_pread_pwrite FAIL(1)PASS(4) FAIL(1)PASS(1) *ILK igt@kms_flip@blocking-absolute-wf_vblank-interruptible PASS(2) DMESG_WARN(1)PASS(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6057 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -1 276/276 275/276
ILK 303/303 303/303 SNB 304/304 304/304 IVB 339/339 339/339 BYT 287/287 287/287 HSW 362/362 362/362 BDW 310/310 310/310
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
PNV igt@gem_userptr_blits@minor-normal-sync DMESG_WARN(1)PASS(2) DMESG_WARN(1)PASS(1)(dmesg patch applied)WARNING:at_drivers/gpu/drm/i915/i915_gem_evict.c:#i915_gem_evict_vm[i915]()@WARNING:.* at .* i915_gem_evict_vm+0x
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
drivers/gpu/drm/i915/i915_reg.h enum skl_disp_power_wells { · line 2755
Quoted 4 lines · Sonika Jindal
drivers/gpu/drm/i915/i915_reg.h +4
-0+#define EDP_MAX_SU_DISABLE_TIME_MASK (0x1f<<20) +#define EDP_PSR2_TP2_TIME_500 (0<<8) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_250 (2<<8)
Better to make all values inline, 500us & 100us should make 2.5ms to 2500 . please correct it.
Quoted 90 lines
drivers/gpu/drm/i915/intel_dp.c +13
-0+uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); +/* PSR2 needs frame sync as well */ +if (frame_sync_cap) { +DRM_DEBUG_KMS ("PSR2 supported on sink" ); + intel_dp->psr2_support = true; + }else + intel_dp->psr2_support = false; + } }/* Training Pattern 3 support, both source and sink */ drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -663,6 +663,8 @@ struct intel_dp {struct intel_dp_mst_encoder *mst_encoders[I915_MAX_PIPES ];struct drm_dp_mst_topology_mgr mst_mgr; +bool psr2_support; +uint32_t (*get_aux_clock_divider)(struct intel_dp *dp,int index);/* * This function returns the value we have to program the AUX_CTL drivers/gpu/drm/i915/intel_psr.c +26
-1@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* Enable AUX frame sync at sink */ +if (intel_dp->psr2_support) +drm_dp_dpcd_writeb (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF , +DP_AUX_FRAME_SYNC_ENABLE ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,@@ -255,6 +276,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +if (intel_dp->psr2_support) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)
drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 397
Quoted 9 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -364,6 +389,9 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {hsw_psr_setup_vsc (intel_dp); +if (intel_dp->psr2_support) +skl_psr_setup_su_vsc (intel_dp); +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP );
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Sivakumar Thulasimani
drivers/gpu/drm/i915/i915_reg.h enum skl_disp_power_wells { · line 2755
Quoted 4 lines · Sonika Jindal
drivers/gpu/drm/i915/i915_reg.h +4
-0+#define EDP_MAX_SU_DISABLE_TIME_MASK (0x1f<<20) +#define EDP_PSR2_TP2_TIME_500 (0<<8) +#define EDP_PSR2_TP2_TIME_100 (1<<8) +#define EDP_PSR2_TP2_TIME_250 (2<<8)Better to make all values inline, 500us & 100us should make 2.5ms to 2500 . please correct it.
Yes, thanks for pointing.
Quoted 93 lines
Quoted 93 lines
drivers/gpu/drm/i915/intel_dp.c +13
-0+uint8_t frame_sync_cap; + + dev_priv->psr.sink_support = true; +intel_dp_dpcd_read_wake (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CAP , + &frame_sync_cap,1 ); +/* PSR2 needs frame sync as well */ +if (frame_sync_cap) { +DRM_DEBUG_KMS ("PSR2 supported on sink" ); + intel_dp->psr2_support = true; + }else + intel_dp->psr2_support = false; + } }/* Training Pattern 3 support, both source and sink */ drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -663,6 +663,8 @@ struct intel_dp {struct intel_dp_mst_encoder *mst_encoders[I915_MAX_PIPES ];struct drm_dp_mst_topology_mgr mst_mgr; +bool psr2_support; +uint32_t (*get_aux_clock_divider)(struct intel_dp *dp,int index);/* * This function returns the value we have to program the AUX_CTL drivers/gpu/drm/i915/intel_psr.c +26
-1@@ -117,6 +117,19 @@ static void vlv_psr_setup_vsc(struct intel_dp *intel_dp)I915_WRITE (VLV_VSCSDP (pipe), val); } +static void skl_psr_setup_su_vsc (struct intel_dp *intel_dp) +{ +struct edp_vsc_psr psr_vsc; + +/* 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 ; + psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB2 =0x3 ; + psr_vsc.sdp_header.HB3 =0xb ; +intel_psr_write_vsc (intel_dp, &psr_vsc); +} +static void hsw_psr_setup_vsc (struct intel_dp *intel_dp) {struct edp_vsc_psr psr_vsc;@@ -165,6 +178,12 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp)drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,DP_PSR_ENABLE & ~DP_PSR_MAIN_LINK_ACTIVE ); +/* Enable AUX frame sync at sink */ +if (intel_dp->psr2_support) +drm_dp_dpcd_writeb (&intel_dp->aux, +DP_SINK_DEVICE_AUX_FRAME_SYNC_CONF , +DP_AUX_FRAME_SYNC_ENABLE ); + aux_data_reg = (INTEL_INFO (dev)->gen >=9 ) ?DPA_AUX_CH_DATA1 :EDP_PSR_AUX_DATA1 (dev); aux_ctl_reg = (INTEL_INFO(dev)->gen >= 9) ?@@ -183,8 +202,10 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) val |= DP_AUX_CH_CTL_TIME_OUT_1600us; val &= ~DP_AUX_CH_CTL_MESSAGE_SIZE_MASK ; val |= (sizeof (aux_msg) <<DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT ); -/* Use hardcoded data values for PSR */ +/* Use hardcoded data values for PSR, frame sync and GTC */ val &= ~DP_AUX_CH_CTL_PSR_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_FS_DATA_AUX_REG_SKL ; + val &= ~DP_AUX_CH_CTL_GTC_DATA_AUX_REG_SKL ;I915_WRITE (aux_ctl_reg, val); }else { I915_WRITE(aux_ctl_reg,@@ -255,6 +276,10 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp) max_sleep_time <<EDP_PSR_MAX_SLEEP_TIME_SHIFT | idle_frames <<EDP_PSR_IDLE_FRAME_SHIFT | EDP_PSR_ENABLE); + +if (intel_dp->psr2_support) +I915_WRITE (EDP_PSR2_CTL ,EDP_PSR2_ENABLE | +EDP_SU_TRACK_ENABLE |EDP_PSR2_TP2_TIME_100 ); }static bool intel_psr_match_conditions (struct intel_dp *intel_dp)@@ -364,6 +389,9 @@ void intel_psr_enable(struct intel_dp *intel_dp)if (HAS_DDI (dev)) {hsw_psr_setup_vsc (intel_dp);
Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp) · line 397
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0+if (intel_dp->psr2_support) +skl_psr_setup_su_vsc (intel_dp); +/* Avoid continuous PSR exit by masking memup and hpd */ I915_WRITE (EDP_PSR_DEBUG_CTL (dev),EDP_PSR_DEBUG_MASK_MEMUP |EDP_PSR_DEBUG_MASK_HPD |EDP_PSR_DEBUG_MASK_LPSP );_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx