drm/i915: add and enable DP AUX CH mutex
Subsystems (2)
PATCH 1/5 drm/i915: add and enable DP AUX CH mutex
When PSR/PSR2 is enabled hardware can do AUX transactions by it self, so lets use the mutex register that is available in gen9+ to avoid concurrent access by hardware and driver.
Reference: https://01.org/sites/default/files/documentation/intel-gfx-prm-osrc-skl-vol12-display.pdf
Page 198 - AUX programming sequence
As gen < 9 don't have the mutex PSR needs to be disabled, that is why the 'else TODO' was added. This is also backed by spec:
"DDI A AUX channel transactions must not be sent while SRD is enabled. SRD must be completely disabled before a DDI A AUX channel transaction can be sent." BSpec: 7530
--- drivers/gpu/drm/i915/i915_reg.h | 9 ++++++++ drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_psr.c | 6 +++++ 4 files changed, 64 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +9 -0
@@ -5318,6 +5318,7 @@ enum {#define _DPA_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6401c)#define _DPA_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64020)#define _DPA_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64024) +#define _DPA_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6402C)#define _DPB_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64110)#define _DPB_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64114)
@@ -5325,6 +5326,7 @@ enum {#define _DPB_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6411c)#define _DPB_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64120)#define _DPB_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64124) +#define _DPB_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6412C)#define _DPC_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64210)#define _DPC_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64214)
@@ -5332,6 +5334,7 @@ enum {#define _DPC_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6421c)#define _DPC_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64220)#define _DPC_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64224) +#define _DPC_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6422C)#define _DPD_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64310)#define _DPD_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64314)
@@ -5339,6 +5342,7 @@ enum {#define _DPD_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6431c)#define _DPD_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64320)#define _DPD_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64324) +#define _DPD_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6432C)#define _DPF_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64510)#define _DPF_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64514)
@@ -5346,9 +5350,11 @@ enum {#define _DPF_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6451c)#define _DPF_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64520)#define _DPF_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64524) +#define _DPF_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6452C)#define DP_AUX_CH_CTL (port) _MMIO_PORT(port, _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL)#define DP_AUX_CH_DATA (port, i) _MMIO(_PORT(port, _DPA_AUX_CH_DATA1, _DPB_AUX_CH_DATA1) + (i) * 4)/* 5 registers */ +#define DP_AUX_CH_MUTEX (port) _MMIO_PORT(port, _DPA_AUX_CH_MUTEX, _DPB_AUX_CH_MUTEX)#define DP_AUX_CH_CTL_SEND_BUSY (1 << 31)#define DP_AUX_CH_CTL_DONE (1 << 30)
@@ -5378,6 +5384,9 @@ enum {#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1) +#define DP_AUX_CH_MUTEX_ENABLE (1 << 31) +#define DP_AUX_CH_MUTEX_STATUS (1 << 30) +/* * Computing GMCH M and N values for the Display Port link *
drivers/gpu/drm/i915/intel_dp.c +48 -0
73 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1040,6 +1040,7 @@ struct intel_dp {i915_reg_t output_reg;i915_reg_t aux_ch_ctl_reg;i915_reg_t aux_ch_data_reg[5 ]; +i915_reg_t aux_ch_mutex_reg;uint32_t DP ;int link_rate;uint8_t lane_count;
drivers/gpu/drm/i915/intel_psr.c +6 -0
@@ -484,6 +484,9 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp,EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg,DP_AUX_CH_MUTEX_ENABLE ); }/**
@@ -617,6 +620,9 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,else WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg, ~DP_AUX_CH_MUTEX_ENABLE ); }/**
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/5 drm/i915: keep AUX powered while PSR is enabled
Hardware can send AUX transactions by it self when PSR is enabled and it expects that AUX is kept powered up.
From spec:
"Each DisplayPort Aux channel has an Aux IO Power Request. If an Aux channel will not be used, it does not need to be powered up.
PSR spontaneously sends Aux transactions. If PSR is enabled on a port, then the associated Aux IO must be kept powered up."
BSpec: 4230
BSpec: 17722
--- drivers/gpu/drm/i915/intel_psr.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_psr.c +8 -0
@@ -516,6 +516,12 @@ void intel_psr_enable(struct intel_dp *intel_dp, goto unlock; } +/* +* hardware can send AUX transactions by it self when PSR is enabled, +* and it expects that AUX is kept powered up. +*/ +intel_display_power_get (dev_priv, intel_dp->aux_power_domain); + dev_priv->psr.psr2_support = crtc_state->has_psr2; dev_priv->psr.busy_frontbuffer_bits =0 ;
@@ -656,6 +662,8 @@ void intel_psr_disable(struct intel_dp *intel_dp,/* Disable PSR on Sink */ drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,0 ); +intel_display_power_put (dev_priv, intel_dp->aux_power_domain); + dev_priv->psr.enabled =NULL ;mutex_unlock (&dev_priv->psr.lock);
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/5] drm/i915: keep AUX powered while PSR is enabled
Quoted 5 lines · José Roberto de Souza
Hardware can send AUX transactions by it self when PSR is enabled and it expects that AUX is kept powered up.
From spec:
Quoted 8 lines
"Each DisplayPort Aux channel has an Aux IO Power Request. If an Aux channel will not be used, it does not need to be powered up.
PSR spontaneously sends Aux transactions. If PSR is enabled on a port, then the associated Aux IO must be kept powered up."
BSpec: 4230
BSpec: 17722
It seems here this is only needed for AUX IO PWs.
So maybe for that we would need some thing like POWER_DOMAIN_PSR_AUX_* that is part of {GLK,CNL}_DISPLAY_AUX_*_POWER_DOMAINS
So here we would get and put the specific PSR_AUX ones instead of the whole dp aux. We don't need to keep the entire well up apparently. At least I hope we don't.
Quoted 39 lines
Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/intel_psr.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/gpu/drm/i915/intel_psr.c +8
-0@@ -516,6 +516,12 @@ void intel_psr_enable(struct intel_dp *intel_dp, goto unlock; } +/* +* hardware can send AUX transactions by it self when PSR is enabled, +* and it expects that AUX is kept powered up. +*/ +intel_display_power_get (dev_priv, intel_dp->aux_power_domain); + dev_priv->psr.psr2_support = crtc_state->has_psr2; dev_priv->psr.busy_frontbuffer_bits =0 ;@@ -656,6 +662,8 @@ void intel_psr_disable(struct intel_dp *intel_dp,/* Disable PSR on Sink */ drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,0 ); +intel_display_power_put (dev_priv, intel_dp->aux_power_domain); + dev_priv->psr.enabled =NULL ;mutex_unlock (&dev_priv->psr.lock);Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/5 drm/i915: Share PSR and PSR2 VSC setup
In reply to José Roberto de SouzaJust share the common code in PSR and PSR2.
--- drivers/gpu/drm/i915/intel_psr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_psr.c +4 -6
@@ -88,11 +88,12 @@ static void hsw_psr_setup_vsc(struct intel_dp *intel_dp,struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev);struct edp_vsc_psr psr_vsc; +memset (&psr_vsc,0 ,sizeof (psr_vsc)); + psr_vsc.sdp_header.HB0 =0 ; + psr_vsc.sdp_header.HB1 =0x7 ; +if (dev_priv->psr.psr2_support) {/* 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 ;if (dev_priv->psr.colorimetry_support && dev_priv->psr.y_cord_support) { psr_vsc.sdp_header.HB2 =0x5 ;
@@ -106,9 +107,6 @@ static void hsw_psr_setup_vsc(struct intel_dp *intel_dp, } }else {/* Prepare VSC packet as per EDP 1.3 spec, Table 3.10 */ -memset (&psr_vsc,0 ,sizeof (psr_vsc)); - psr_vsc.sdp_header.HB0 =0 ; - psr_vsc.sdp_header.HB1 =0x7 ; psr_vsc.sdp_header.HB2 =0x2 ; psr_vsc.sdp_header.HB3 =0x8 ; }
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/5 drm/i915: Replace magic number with macro defined by drm
In reply to José Roberto de Souza--- drivers/gpu/drm/i915/intel_psr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_psr.c +1 -1
@@ -90,7 +90,7 @@ static void hsw_psr_setup_vsc(struct intel_dp *intel_dp,memset (&psr_vsc,0 ,sizeof (psr_vsc)); psr_vsc.sdp_header.HB0 =0 ; - psr_vsc.sdp_header.HB1 =0x7 ; + psr_vsc.sdp_header.HB1 =DP_SDP_VSC ;if (dev_priv->psr.psr2_support) {/* Prepare VSC Header for SU as per EDP 1.4 spec, Table 6.11 */
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/5 drm/i915: Make use of unused variable in hsw_write_infoframe()
In reply to José Roberto de Souzadata_reg was not being used but it can be used to reduce the number of calls to hsw_dip_data_reg() and just increment the reg by the size of uint32.
--- drivers/gpu/drm/i915/intel_hdmi.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +4 -8
@@ -393,15 +393,11 @@ static void hsw_write_infoframe(struct drm_encoder *encoder,I915_WRITE (ctl_reg, val);mmiowb (); -for (i =0 ; i < len; i +=4 ) { -I915_WRITE (hsw_dip_data_reg (dev_priv, cpu_transcoder, - type, i >>2 ), *data); - data++; - } +for (i =0 ; i < len; i +=4 , data++, data_reg.reg +=4 ) +I915_WRITE (data_reg, *data);/* Write every possible data byte to force correct ECC calculation. */ -for (; i < data_size; i +=4 ) -I915_WRITE (hsw_dip_data_reg (dev_priv, cpu_transcoder, - type, i >>2 ),0 ); +for (; i < data_size; i +=4 , data_reg.reg +=4 ) +I915_WRITE (data_reg,0 );mmiowb (); val |=hsw_infoframe_enable (type);
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5] drm/i915: Make use of unused variable in hsw_write_infoframe()
Quoted 14 lines · José Roberto de Souza
data_regwas not being used but it can be used to reduce the number of calls tohsw_dip_data_reg()and just increment the reg by the size of uint32.Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/intel_hdmi.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/intel_hdmi.c +0
-0
drivers/gpu/drm/i915/intel_hdmi.c static void hsw_write_infoframe(struct drm_encoder *encoder, · line 398
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdmi.c +0
-3@@ -393,15 +393,11 @@ static void hsw_write_infoframe(struct drm_encoder *encoder,I915_WRITE (ctl_reg, val);mmiowb (); -for (i =0 ; i < len; i +=4 ) { -I915_WRITE (hsw_dip_data_reg (dev_priv, cpu_transcoder, - type, i >>2 ), *data);a
i>>2 != 0
just kill 'data_reg'
Quoted 20 lines
drivers/gpu/drm/i915/intel_hdmi.c +4
-5- data++; - } +for (i =0 ; i < len; i +=4 , data++, data_reg.reg +=4 ) +I915_WRITE (data_reg, *data);/* Write every possible data byte to force correct ECC calculation. */ -for (; i < data_size; i +=4 ) -I915_WRITE (hsw_dip_data_reg (dev_priv, cpu_transcoder, - type, i >>2 ),0 ); +for (; i < data_size; i +=4 , data_reg.reg +=4 ) +I915_WRITE (data_reg,0 );mmiowb (); val |=hsw_infoframe_enable (type);Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5] drm/i915: Make use of unused variable in hsw_write_infoframe()
Quoting Ville Syrjälä (2018-02-14 13:33:03)
Quoted 10 lines · José Roberto de Souza
Quoted 9 lines
data_regwas not being used but it can be used to reduce the number of calls tohsw_dip_data_reg()and just increment the reg by the size of uint32.Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/intel_hdmi.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdmi.c static void hsw_write_infoframe(struct drm_encoder *encoder, · line 395
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdmi.c +0
-0@@ -393,15 +393,11 @@ static void hsw_write_infoframe(struct drm_encoder *encoder,I915_WRITE (ctl_reg, val);mmiowb ();
mmiowb() is just a compiler barrier on x86, and meaningless wrt to our uncached mmio. If you need a full mmio barrier, use POSTING_READ(). -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5] drm/i915: Make use of unused variable in hsw_write_infoframe()
Quoted 18 lines · Chris Wilson
Quoting Ville Syrjälä (2018-02-14 13:33:03)
Quoted 17 lines · José Roberto de Souza
Quoted 16 lines
data_regwas not being used but it can be used to reduce the number of calls tohsw_dip_data_reg()and just increment the reg by the size of uint32.Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/intel_hdmi.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/intel_hdmi.c +0
-0@@ -393,15 +393,11 @@ static void hsw_write_infoframe(struct drm_encoder *encoder,I915_WRITE (ctl_reg, val);
Quoted 4 lines
Quoted 1 line
drivers/gpu/drm/i915/intel_hdmi.c static void hsw_write_infoframe(struct drm_encoder *encoder, · line 395
Quoted 1 line
drivers/gpu/drm/i915/intel_hdmi.c +0
-0mmiowb ();
mmiowb()is just a compiler barrier on x86, and meaningless wrt to our uncached mmio. If you need a full mmio barrier, usePOSTING_READ().
Yeah, someone should nuke all the mmiowb()s from the infoframe code. I still don't understand what they were supposed to achieve.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 5/5] drm/i915: Make use of unused variable in hsw_write_infoframe()
In reply to Ville SyrjäläQuoted 17 lines · Ville Syrjälä
Quoted 16 lines · José Roberto de Souza
data_regwas not being used but it can be used to reduce the number of calls tohsw_dip_data_reg()and just increment the reg by the size of uint32.Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/intel_hdmi.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/intel_hdmi.c +0
-0@@ -393,15 +393,11 @@ static void hsw_write_infoframe(struct drm_encoder *encoder,I915_WRITE (ctl_reg, val);
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdmi.c static void hsw_write_infoframe(struct drm_encoder *encoder,
Quoted 4 lines
drivers/gpu/drm/i915/intel_hdmi.c +0
-3mmiowb (); -for (i =0 ; i < len; i +=4 ) { -I915_WRITE (hsw_dip_data_reg (dev_priv, cpu_transcoder, - type, i >>2 ), *data);ai>>2 != 0
just kill '
data_reg'
What Ville says.
Furthermore, you're *not* supposed to mess with the contents of i915_reg_t. That we use a typedef to begin with means "don't touch the guts of this one".
BR,
Jani.
Quoted 21 lines
Quoted 21 lines
drivers/gpu/drm/i915/intel_hdmi.c +4
-5- data++; - } +for (i =0 ; i < len; i +=4 , data++, data_reg.reg +=4 ) +I915_WRITE (data_reg, *data);/* Write every possible data byte to force correct ECC calculation. */ -for (; i < data_size; i +=4 ) -I915_WRITE (hsw_dip_data_reg (dev_priv, cpu_transcoder, - type, i >>2 ),0 ); +for (; i < data_size; i +=4 , data_reg.reg +=4 ) +I915_WRITE (data_reg,0 );mmiowb (); val |=hsw_infoframe_enable (type);Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [1/5] drm/i915: add and enable DP AUX CH mutex
In reply to José Roberto de Souza== Series Details ==
== Series Details ==
Series: series starting with [1/5] drm/i915: add and enable DP AUX CH mutex
URL : https://patchwork.freedesktop.org/series/38201/
State : failure
== Summary ==
CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CHK include/generated/bounds.h CHK include/generated/timeconst.h CHK include/generated/asm-offsets.h CALL scripts/checksyscalls.sh DESCEND objtool CHK scripts/mod/devicetable-offsets.h CHK include/generated/compile.h CHK kernel/config_data.h CC [M] drivers/gpu/drm/i915/intel_dp.o
drivers/gpu/drm/i915/intel_dp.c: In function ‘intel_dp_aux_ch’:drivers/gpu/drm/i915/intel_dp.c:1290:2: error: expected expression before ‘}’ token
}
^scripts/Makefile.build:316: recipe for target 'drivers/gpu/drm/i915/intel_dp.o' failed make[4]: *** [drivers/gpu/drm/i915/intel_dp.o] Error 1 scripts/Makefile.build:575: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:575: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:575: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2
Makefile:1048: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerQuoted 85 lines · José Roberto de Souza
When PSR/PSR2 is enabled hardware can do AUX transactions by it self, so lets use the mutex register that is available in gen9+ to avoid concurrent access by hardware and driver.
Reference: https://01.org/sites/default/files/documentation/intel-gfx-prm-osrc-skl-vol12-display.pdf
Page 198 - AUX programming sequenceAs gen < 9 don't have the mutex PSR needs to be disabled, that is why the 'else TODO' was added. This is also backed by spec:
"DDI A AUX channel transactions must not be sent while SRD is enabled. SRD must be completely disabled before a DDI A AUX channel transaction can be sent." BSpec: 7530Cc Rodrigo Vivi <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 9 ++++++++ drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_psr.c | 6 +++++ 4 files changed, 64 insertions(+)drivers/gpu/drm/i915/i915_reg.h +9
-0@@ -5318,6 +5318,7 @@ enum {#define _DPA_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6401c)#define _DPA_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64020)#define _DPA_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64024) +#define _DPA_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6402C)#define _DPB_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64110)#define _DPB_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64114)@@ -5325,6 +5326,7 @@ enum {#define _DPB_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6411c)#define _DPB_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64120)#define _DPB_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64124) +#define _DPB_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6412C)#define _DPC_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64210)#define _DPC_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64214)@@ -5332,6 +5334,7 @@ enum {#define _DPC_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6421c)#define _DPC_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64220)#define _DPC_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64224) +#define _DPC_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6422C)#define _DPD_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64310)#define _DPD_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64314)@@ -5339,6 +5342,7 @@ enum {#define _DPD_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6431c)#define _DPD_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64320)#define _DPD_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64324) +#define _DPD_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6432C)#define _DPF_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64510)#define _DPF_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64514)@@ -5346,9 +5350,11 @@ enum {#define _DPF_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6451c)#define _DPF_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64520)#define _DPF_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64524) +#define _DPF_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6452C)#define DP_AUX_CH_CTL (port) _MMIO_PORT(port, _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL)#define DP_AUX_CH_DATA (port, i) _MMIO(_PORT(port, _DPA_AUX_CH_DATA1, _DPB_AUX_CH_DATA1) + (i) * 4)/* 5 registers */ +#define DP_AUX_CH_MUTEX (port) _MMIO_PORT(port, _DPA_AUX_CH_MUTEX, _DPB_AUX_CH_MUTEX)#define DP_AUX_CH_CTL_SEND_BUSY (1 << 31)#define DP_AUX_CH_CTL_DONE (1 << 30)@@ -5378,6 +5384,9 @@ enum {#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1) +#define DP_AUX_CH_MUTEX_ENABLE (1 << 31) +#define DP_AUX_CH_MUTEX_STATUS (1 << 30) +/* * Computing GMCH M and N values for the Display Port link * drivers/gpu/drm/i915/intel_dp.c +0
-0
drivers/gpu/drm/i915/intel_dp.c static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, · line 1087
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +4
-0@@ -1081,6 +1081,28 @@ static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, aux_clock_divider); } +static bool intel_dp_aux_get (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp) +{ +int try, ret;
Here you are not getting the aux. You are only getting checking if aux is available.
My understanding of the spec is that the actual get is set Enable bit.
drivers/gpu/drm/i915/intel_dp.c static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, · line 1091
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c +4
-0+ +for (try =0 , ret =-1 ; try <3 && ret; try++) + ret =wait_for (!(I915_READ_NOTRACE (intel_dp->aux_ch_mutex_reg) + &DP_AUX_CH_MUTEX_STATUS ),0.5 );
what about
intel_wait_for_register(dev_priv, intel_dp->aux_ch_mutex_reg,
DP_AUX_CH_MUTEX_STATUS, 0, 500)
?
drivers/gpu/drm/i915/intel_dp.c static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, · line 1102
Quoted 11 lines
drivers/gpu/drm/i915/intel_dp.c +11
-0+ +return ret ==0 ; +} + +static void intel_dp_aux_put (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp) +{ +/* setting the status bit releases the mutex + keep set the bit +* to keep the mutex enabled. +*/ + I915_WRITE(intel_dp->aux_ch_mutex_reg, DP_AUX_CH_MUTEX_ENABLE |
The enable bit is optional here.
I believe it gets cleaner without it but with RMW.
drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1142
Quoted 13 lines
drivers/gpu/drm/i915/intel_dp.c +6
-0+ DP_AUX_CH_MUTEX_STATUS); +} + static int intel_dp_aux_ch(struct intel_dp *intel_dp, const uint8_t *send, int send_bytes,@@ -1115,6 +1137,21 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,intel_dp_check_edp (intel_dp); +/* Get hardware mutex when PSR is enabled */ +if (dev_priv->psr.enabled == intel_dp) { +if (intel_dp->aux_ch_mutex_reg.reg) {
these checks could be inside get function.
drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1145
Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0+if (intel_dp_aux_get (dev_priv, intel_dp)) { +DRM_WARN ("dp_aux_ch port locked for too long");
as well the message DRM_ERROR is enough I thing.
drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1145
Quoted 1 line
drivers/gpu/drm/i915/intel_dp.c +1
-0+ ret = -EBUSY ;
also specific errno
Quoted 13 lines
drivers/gpu/drm/i915/intel_dp.c +9
-0+ goto out_locked; + } + }else { +/* TODO: go to PSR exit state waiting for change before +* do a aux ch transaction. +*/ + } + } +/* Try to wait for any previous AUX channel activity */ for (try =0 ; try <3 ; try++) {drivers/gpu/drm/i915/intel_dp.c +0
-0status =I915_READ_NOTRACE (ch_ctl);
drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1285
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0@@ -1243,7 +1280,16 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, recv + i, recv_bytes - i); ret = recv_bytes; + out: +if (dev_priv->psr.enabled == intel_dp) {
we are checking psr.enable out of psr mutexes...
probably better to only do this once on get part
and if you got you put...
Quoted 36 lines
drivers/gpu/drm/i915/intel_dp.c +9
-0+if (intel_dp->aux_ch_mutex_reg.reg) +intel_dp_aux_put (dev_priv, intel_dp); + else +/* TODO: schedule PSR work to active PSR again */ + } + +out_locked:pm_qos_update_request (&dev_priv->pm_qos,PM_QOS_DEFAULT_VALUE );if (vdd)@@ -1496,6 +1542,8 @@ static void intel_aux_reg_init(struct intel_dp *intel_dp) intel_dp->aux_ch_ctl_reg =intel_aux_ctl_reg (dev_priv, port);for (i =0 ; i <ARRAY_SIZE (intel_dp->aux_ch_data_reg); i++) intel_dp->aux_ch_data_reg[i] =intel_aux_data_reg (dev_priv, port, i); +if (INTEL_INFO (dev_priv)->gen >=9 ) + intel_dp->aux_ch_mutex_reg =DP_AUX_CH_MUTEX (port); } static voiddrivers/gpu/drm/i915/intel_drv.h +1
-0@@ -1040,6 +1040,7 @@ struct intel_dp {i915_reg_t output_reg;i915_reg_t aux_ch_ctl_reg;i915_reg_t aux_ch_data_reg[5 ]; +i915_reg_t aux_ch_mutex_reg;uint32_t DP ;int link_rate;uint8_t lane_count;drivers/gpu/drm/i915/intel_psr.c +0
-0
drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_enable_source(struct intel_dp *intel_dp, · line 490
Quoted 7 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -484,6 +484,9 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp,EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg,DP_AUX_CH_MUTEX_ENABLE );
My understanding is that set Enable is the actual get hw mutex, so I don't believe you want do do this here.
Also you already check for psr.enable inside the aux transaction. setting there should be enough.
Quoted 20 lines
drivers/gpu/drm/i915/intel_psr.c +0
-0}/**
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -617,6 +620,9 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,else WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg, ~DP_AUX_CH_MUTEX_ENABLE ); }/** Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 132 lines · Rodrigo Vivi
Quoted 130 lines · José Roberto de Souza
When PSR/PSR2 is enabled hardware can do AUX transactions by it self, so
lets use the mutex register that is available in gen9+ to avoid concurrent
access by hardware and driver.Reference: https://01.org/sites/default/files/documentation/intel-g
fx-prm-osrc-skl-vol12-display.pdf
Page 198 - AUX programming sequenceAs gen < 9 don't have the mutex PSR needs to be disabled, that is why the
'else TODO' was added. This is also backed by spec:
"DDI A AUX channel transactions must not be sent while SRD is enabled.
SRD must be completely disabled before a DDI A AUX channel transaction can
be sent." BSpec: 7530Cc Rodrigo Vivi <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 9 ++++++++ drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_psr.c | 6 +++++ 4 files changed, 64 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -5318,6 +5318,7 @@ enum {#define _DPA_AUX_CH_DATA3 (dev_priv- >info.display_mmio_offset + 0x6401c)#define _DPA_AUX_CH_DATA4 (dev_priv- >info.display_mmio_offset + 0x64020)#define _DPA_AUX_CH_DATA5 (dev_priv- >info.display_mmio_offset + 0x64024) +#define _DPA_AUX_CH_MUTEX (dev_priv-Quoted 1 line
info.display_mmio_offset +
0x6402C)#define
_DPB_AUX_CH_CTL(dev_priv-Quoted 1 line
info.display_mmio_offset +
0x64110)#define
_DPB_AUX_CH_DATA1(dev_priv-Quoted 1 line
info.display_mmio_offset +
0x64114)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -5325,6 +5326,7 @@ enum {#define _DPB_AUX_CH_DATA3 (dev_priv- >info.display_mmio_offset + 0x6411c)#define _DPB_AUX_CH_DATA4 (dev_priv- >info.display_mmio_offset + 0x64120)#define _DPB_AUX_CH_DATA5 (dev_priv- >info.display_mmio_offset + 0x64124) +#define _DPB_AUX_CH_MUTEX (dev_priv-Quoted 1 line
info.display_mmio_offset +
0x6412C)#define
_DPC_AUX_CH_CTL(dev_priv-Quoted 1 line
info.display_mmio_offset +
0x64210)#define
_DPC_AUX_CH_DATA1(dev_priv-Quoted 1 line
info.display_mmio_offset +
0x64214)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -5332,6 +5334,7 @@ enum {#define _DPC_AUX_CH_DATA3 (dev_priv- >info.display_mmio_offset + 0x6421c)#define _DPC_AUX_CH_DATA4 (dev_priv- >info.display_mmio_offset + 0x64220)#define _DPC_AUX_CH_DATA5 (dev_priv- >info.display_mmio_offset + 0x64224) +#define _DPC_AUX_CH_MUTEX (dev_priv-Quoted 1 line
info.display_mmio_offset +
0x6422C)#define
_DPD_AUX_CH_CTL(dev_priv-Quoted 1 line
info.display_mmio_offset +
0x64310)#define
_DPD_AUX_CH_DATA1(dev_priv-Quoted 1 line
info.display_mmio_offset +
0x64314)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -5339,6 +5342,7 @@ enum {#define _DPD_AUX_CH_DATA3 (dev_priv- >info.display_mmio_offset + 0x6431c)#define _DPD_AUX_CH_DATA4 (dev_priv- >info.display_mmio_offset + 0x64320)#define _DPD_AUX_CH_DATA5 (dev_priv- >info.display_mmio_offset + 0x64324) +#define _DPD_AUX_CH_MUTEX (dev_priv-Quoted 1 line
info.display_mmio_offset +
0x6432C)#define
_DPF_AUX_CH_CTL(dev_priv-Quoted 1 line
info.display_mmio_offset +
0x64510)#define
_DPF_AUX_CH_DATA1(dev_priv-Quoted 1 line
info.display_mmio_offset +
0x64514)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -5346,9 +5350,11 @@ enum {#define _DPF_AUX_CH_DATA3 (dev_priv- >info.display_mmio_offset + 0x6451c)#define _DPF_AUX_CH_DATA4 (dev_priv- >info.display_mmio_offset + 0x64520)#define _DPF_AUX_CH_DATA5 (dev_priv- >info.display_mmio_offset + 0x64524) +#define _DPF_AUX_CH_MUTEX (dev_priv- >info.display_mmio_offset + 0x6452C)#define DP_AUX_CH_CTL (port) _MMIO_PORT(port,
_DPA_AUX_CH_CTL,_DPB_AUX_CH_CTL)
#defineDP_AUX_CH_DATA(port, i)_MMIO(_PORT(port,_DPA_AUX_CH_DATA1,_DPB_AUX_CH_DATA1) + (i) * 4) /* 5 registers */
+#defineDP_AUX_CH_MUTEX(port)_MMIO_PORT(port,_DPA_AUX_CH_MUTEX,_DPB_AUX_CH_MUTEX)#define
DP_AUX_CH_CTL_SEND_BUSY(1 << 31)
#defineDP_AUX_CH_CTL_DONE(1 << 30)drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -5378,6 +5384,9 @@ enum {#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1) +#define DP_AUX_CH_MUTEX_ENABLE (1 << 31) +#define DP_AUX_CH_MUTEX_STATUS (1 << 30) +/* * Computing GMCH M and N values for the Display Port link * drivers/gpu/drm/i915/intel_dp.c +0
-0@@ -1081,6 +1081,28 @@ static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, aux_clock_divider) ; }
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, · line 1087
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c +4
-0+static bool intel_dp_aux_get (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp) +{ +int try, ret;Here you are not getting the aux. You are only getting checking if aux
is available.
My understanding of the spec is that the actual get is set Enable bit.
The spec is not clear but because of this 2 statements I think this is correct:
- statement 1:
Release with (is optional) or without disabling MUTEX function. DDI_AUX_MUTEX[31:30]= "11"
OR
DDI_AUX_MUTEX[31:30]="01"
So here you release the mutex by always seting the bit 30(status) and is optinal disable the mutex.
- statement 2:
Enable MUTEX without changing MUTEX status
DDI_AUX_MUTEX[31]='1'
Also adding a few aux transactions before and after PSR exit/enable I was able to confirm that the hardware got the mutex as the status bit was set and after sleep for 500usec it was released.
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c +3
-0+ +for (try =0 , ret =-1 ; try <3 && ret; try++) + ret = wait_for(!(I915_READ_NOTRACE(intel_dp-
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c static uint32_t · line 1094
Quoted 2 lines
drivers/gpu/drm/i915/intel_dp.c +1
-0>aux_ch_mutex_reg) + & DP_AUX_CH_MUTEX_STATUS), 0.5);what about
intel_wait_for_register(dev_priv,intel_dp->aux_ch_mutex_reg,DP_AUX_CH_MUTEX_STATUS, 0, 500)?
This difference that I can see between wait_for() and intel_wait_for_register() is that intel_wait_for_register() will call intel_uncore_forcewake_get__locked()/put_locked() is used to kept the hardware domain wake?
I'm fine with both but intel_wait_for_register() have a msec parameter so the timeout would need to be 2msec or 3mesc(something between the actual 1.5msec).
Quoted 17 lines
Quoted 13 lines
drivers/gpu/drm/i915/intel_dp.c +8
-0+ +return ret ==0 ; +} + +static void intel_dp_aux_put (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp) +{ +/* setting the status bit releases the mutex + keep set the bit
drivers/gpu/drm/i915/intel_dp.c +3
-0+* to keep the mutex enabled. +*/ + I915_WRITE(intel_dp->aux_ch_mutex_reg,Quoted 1 line
DP_AUX_CH_MUTEX_ENABLE|The enable bit is optional here.
I believe it gets cleaner without it but with RMW.
See why I belive this is correct above.
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/i915/intel_dp.c +3
-0+ DP_AUX_CH_MUTEX_STATUS); +} + static int intel_dp_aux_ch(struct intel_dp *intel_dp, const uint8_t *send, int send_bytes,@@ -1115,6 +1137,21 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1142
Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +3
-0intel_dp_check_edp (intel_dp); +/* Get hardware mutex when PSR is enabled */ +if (dev_priv->psr.enabled == intel_dp) { +if (intel_dp->aux_ch_mutex_reg.reg) {these checks could be inside get function.
Huum and in case of gen < 9, exit PSR inside of this function?
Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0+if (intel_dp_aux_get (dev_priv, intel_dp)) { + DRM_WARN("dp_aux_ch port lockedfor too
long");as well the message
DRM_ERRORis enough I thing.
ack
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1145
Quoted 2 lines
drivers/gpu/drm/i915/intel_dp.c +1
-0+ ret = -EBUSY ;also specific errno
ack
Quoted 17 lines
Quoted 17 lines
drivers/gpu/drm/i915/intel_dp.c +4
-0+ goto out_locked; + } + }else { +/* TODO: go to PSR exit state waiting for change before
drivers/gpu/drm/i915/intel_dp.c +5
-0+* do a aux ch transaction. +*/ + } + } +/* Try to wait for any previous AUX channel activity */ for (try =0 ; try <3 ; try++) { status =I915_READ_NOTRACE (ch_ctl);@@ -1243,7 +1280,16 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, recv + i, recv_bytes - i);
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1285
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0ret = recv_bytes; + out: +if (dev_priv->psr.enabled == intel_dp) {we are checking psr.enable out of psr mutexes...
probably better to only do this once on get part
and if you got you put...
ack
Quoted 58 lines
Quoted 46 lines
drivers/gpu/drm/i915/intel_dp.c +4
-0+if (intel_dp->aux_ch_mutex_reg.reg) +intel_dp_aux_put (dev_priv, intel_dp); +else +/* TODO: schedule PSR work to active PSR again */
drivers/gpu/drm/i915/intel_dp.c +3
-0+ } + +out_locked: pm_qos_update_request(&dev_priv->pm_qos,
PM_QOS_DEFAULT_VALUE);drivers/gpu/drm/i915/intel_dp.c +0
-0if (vdd)@@ -1496,6 +1542,8 @@ static void intel_aux_reg_init(struct intel_dp *intel_dp) intel_dp->aux_ch_ctl_reg = intel_aux_ctl_reg(dev_priv, port);for (i =0 ; i <ARRAY_SIZE (intel_dp->aux_ch_data_reg); i++) intel_dp->aux_ch_data_reg[i] =
intel_aux_data_reg(dev_priv, port, i);drivers/gpu/drm/i915/intel_dp.c +2
-0+if (INTEL_INFO (dev_priv)->gen >=9 ) + intel_dp->aux_ch_mutex_reg =
DP_AUX_CH_MUTEX(port);
}static void
drivers/gpu/drm/i915/intel_drv.h +1
-0@@ -1040,6 +1040,7 @@ struct intel_dp {i915_reg_t output_reg;i915_reg_t aux_ch_ctl_reg;i915_reg_t aux_ch_data_reg[5 ]; +i915_reg_t aux_ch_mutex_reg;uint32_t DP ;int link_rate;uint8_t lane_count;drivers/gpu/drm/i915/intel_psr.c +0
-0drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_enable_source(struct · line 491
Quoted 8 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -484,6 +484,9 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp,EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg,DP_AUX_CH_MUTEX_ENABLE );My understanding is that set Enable is the actual get hw mutex, so I don't believe you want do do this here.
Quoted 2 lines
Also you already check for psr.enable inside the aux transaction. setting there should be enough.
See above.
Quoted 16 lines
Quoted 16 lines
drivers/gpu/drm/i915/intel_psr.c +0
-0}/**
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -617,6 +620,9 @@ static void hsw_psr_disable(struct intel_dp *intel_dp, elseWARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg, ~DP_AUX_CH_MUTEX_ENABLE );}
Quoted 8 lines
Quoted 8 lines
/**
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 106 lines · Rodrigo Vivi
Quoted 85 lines · José Roberto de Souza
When PSR/PSR2 is enabled hardware can do AUX transactions by it self, so lets use the mutex register that is available in gen9+ to avoid concurrent access by hardware and driver.
Reference: https://01.org/sites/default/files/documentation/intel-gfx-prm-osrc-skl-vol12-display.pdf
Page 198 - AUX programming sequenceAs gen < 9 don't have the mutex PSR needs to be disabled, that is why the 'else TODO' was added. This is also backed by spec:
"DDI A AUX channel transactions must not be sent while SRD is enabled. SRD must be completely disabled before a DDI A AUX channel transaction can be sent." BSpec: 7530Cc Rodrigo Vivi <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 9 ++++++++ drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_psr.c | 6 +++++ 4 files changed, 64 insertions(+)drivers/gpu/drm/i915/i915_reg.h +9
-0@@ -5318,6 +5318,7 @@ enum {#define _DPA_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6401c)#define _DPA_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64020)#define _DPA_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64024) +#define _DPA_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6402C)#define _DPB_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64110)#define _DPB_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64114)@@ -5325,6 +5326,7 @@ enum {#define _DPB_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6411c)#define _DPB_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64120)#define _DPB_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64124) +#define _DPB_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6412C)#define _DPC_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64210)#define _DPC_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64214)@@ -5332,6 +5334,7 @@ enum {#define _DPC_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6421c)#define _DPC_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64220)#define _DPC_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64224) +#define _DPC_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6422C)#define _DPD_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64310)#define _DPD_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64314)@@ -5339,6 +5342,7 @@ enum {#define _DPD_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6431c)#define _DPD_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64320)#define _DPD_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64324) +#define _DPD_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6432C)#define _DPF_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64510)#define _DPF_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64514)@@ -5346,9 +5350,11 @@ enum {#define _DPF_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6451c)#define _DPF_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64520)#define _DPF_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64524) +#define _DPF_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6452C)#define DP_AUX_CH_CTL (port) _MMIO_PORT(port, _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL)#define DP_AUX_CH_DATA (port, i) _MMIO(_PORT(port, _DPA_AUX_CH_DATA1, _DPB_AUX_CH_DATA1) + (i) * 4)/* 5 registers */ +#define DP_AUX_CH_MUTEX (port) _MMIO_PORT(port, _DPA_AUX_CH_MUTEX, _DPB_AUX_CH_MUTEX)#define DP_AUX_CH_CTL_SEND_BUSY (1 << 31)#define DP_AUX_CH_CTL_DONE (1 << 30)@@ -5378,6 +5384,9 @@ enum {#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1) +#define DP_AUX_CH_MUTEX_ENABLE (1 << 31) +#define DP_AUX_CH_MUTEX_STATUS (1 << 30) +/* * Computing GMCH M and N values for the Display Port link * drivers/gpu/drm/i915/intel_dp.c +0
-0drivers/gpu/drm/i915/intel_dp.c static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, · line 1087
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +4
-0@@ -1081,6 +1081,28 @@ static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, aux_clock_divider); } +static bool intel_dp_aux_get (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp) +{ +int try, ret;Here you are not getting the aux. You are only getting checking if aux is available.
My understanding of the spec is that the actual get is set Enable bit.drivers/gpu/drm/i915/intel_dp.c static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, · line 1091
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c +4
-0+ +for (try =0 , ret =-1 ; try <3 && ret; try++) + ret =wait_for (!(I915_READ_NOTRACE (intel_dp->aux_ch_mutex_reg) + &DP_AUX_CH_MUTEX_STATUS ),0.5 );what about
intel_wait_for_register(dev_priv,intel_dp->aux_ch_mutex_reg,
Quoted 2 lines
DP_AUX_CH_MUTEX_STATUS, 0, 500)
IIRC when I asked Art about the mutex he indicated that the hardware has no magic fair arbitration mechanism. So I think what we want to do is first check if the mutex is free, if not we could try to wait for the expected 500us (or poll somewhat infrequently), but if after a while the mutex still isn't free we should probably start hammering it hard so that have a better chance of actually getting it.
Quoted 42 lines
?
drivers/gpu/drm/i915/intel_dp.c static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, · line 1102
Quoted 11 lines
drivers/gpu/drm/i915/intel_dp.c +11
-0+ +return ret ==0 ; +} + +static void intel_dp_aux_put (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp) +{ +/* setting the status bit releases the mutex + keep set the bit +* to keep the mutex enabled. +*/ + I915_WRITE(intel_dp->aux_ch_mutex_reg, DP_AUX_CH_MUTEX_ENABLE |The enable bit is optional here.
I believe it gets cleaner without it but with RMW.drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1142
Quoted 13 lines
drivers/gpu/drm/i915/intel_dp.c +6
-0+ DP_AUX_CH_MUTEX_STATUS); +} + static int intel_dp_aux_ch(struct intel_dp *intel_dp, const uint8_t *send, int send_bytes,@@ -1115,6 +1137,21 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,intel_dp_check_edp (intel_dp); +/* Get hardware mutex when PSR is enabled */ +if (dev_priv->psr.enabled == intel_dp) { +if (intel_dp->aux_ch_mutex_reg.reg) {these checks could be inside get function.
drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1145
Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0+if (intel_dp_aux_get (dev_priv, intel_dp)) { +DRM_WARN ("dp_aux_ch port locked for too long");as well the message
DRM_ERRORis enough I thing.drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1145
Quoted 1 line
drivers/gpu/drm/i915/intel_dp.c +1
-0+ ret = -EBUSY ;also specific errno
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1153
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +8
-0+ goto out_locked; + } + }else { +/* TODO: go to PSR exit state waiting for change before +* do a aux ch transaction. +*/ + } + }
This looks needlessly complicated. IMO it should just be something like:
if (!skl_aux_hw_mutex_get())
goto fail;
And I'm thinking we should just ignore the PSR on vs. off case, and just do this for eDP always. I can't recall if GTC is a thing for normak DP, but if it is and we ever enable it then we'd obviously need to start doing this for all DP port.
Quoted 25 lines
drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1285
Quoted 11 lines
drivers/gpu/drm/i915/intel_dp.c +1
-0+/* Try to wait for any previous AUX channel activity */ for (try =0 ; try <3 ; try++) {drivers/gpu/drm/i915/intel_dp.c +2
-0status =I915_READ_NOTRACE (ch_ctl);@@ -1243,7 +1280,16 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, recv + i, recv_bytes - i); ret = recv_bytes; + out: +if (dev_priv->psr.enabled == intel_dp) {we are checking psr.enable out of psr mutexes...
probably better to only do this once on get part
and if you got you put...Quoted 9 lines
drivers/gpu/drm/i915/intel_dp.c +7
-0+if (intel_dp->aux_ch_mutex_reg.reg) +intel_dp_aux_put (dev_priv, intel_dp); + else +/* TODO: schedule PSR work to active PSR again */ + } + +out_locked:pm_qos_update_request (&dev_priv->pm_qos,PM_QOS_DEFAULT_VALUE );
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c static void intel_aux_reg_init(struct intel_dp *intel_dp) · line 1546
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0if (vdd)@@ -1496,6 +1542,8 @@ static void intel_aux_reg_init(struct intel_dp *intel_dp) intel_dp->aux_ch_ctl_reg =intel_aux_ctl_reg (dev_priv, port);for (i =0 ; i <ARRAY_SIZE (intel_dp->aux_ch_data_reg); i++) intel_dp->aux_ch_data_reg[i] =intel_aux_data_reg (dev_priv, port, i); +if (INTEL_INFO (dev_priv)->gen >=9 ) + intel_dp->aux_ch_mutex_reg =DP_AUX_CH_MUTEX (port);
No point in adding this thing IMO.
Quoted 22 lines
Quoted 22 lines
drivers/gpu/drm/i915/intel_dp.c +0
-0} static voiddrivers/gpu/drm/i915/intel_drv.h +1
-0@@ -1040,6 +1040,7 @@ struct intel_dp {i915_reg_t output_reg;i915_reg_t aux_ch_ctl_reg;i915_reg_t aux_ch_data_reg[5 ]; +i915_reg_t aux_ch_mutex_reg;uint32_t DP ;int link_rate;uint8_t lane_count;drivers/gpu/drm/i915/intel_psr.c +0
-0@@ -484,6 +484,9 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp,EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP);
Quoted 8 lines
drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_enable_source(struct intel_dp *intel_dp,
Quoted 5 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0} + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg,DP_AUX_CH_MUTEX_ENABLE );My understanding is that set Enable is the actual get hw mutex, so I don't believe you want do do this here.
The register read is the 'get'. But I also think we should just set the enable bit in the _get() function as well. I don't think there should be any harm if we just leave the enable bit set permenently after that.
Quoted 28 lines
Also you already check for psr.enable inside the aux transaction. setting there should be enough.
Quoted 20 lines
drivers/gpu/drm/i915/intel_psr.c +0
-0}/**
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -617,6 +620,9 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,else WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg, ~DP_AUX_CH_MUTEX_ENABLE ); }/** Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 9 lines · José Roberto de Souza
When PSR/PSR2 is enabled hardware can do AUX transactions by it self, so lets use the mutex register that is available in gen9+ to avoid concurrent access by hardware and driver.
Reference: https://01.org/sites/default/files/documentation/intel-gfx-prm-osrc-skl-vol12-display.pdf
Page 198 - AUX programming sequenceAs gen < 9 don't have the mutex PSR needs to be disabled, that is why the 'else TODO' was added. This is also backed by spec:
And proves the patches weren't compiled not to mention tested. :(
BR,
Jani.
Quoted 188 lines
"DDI A AUX channel transactions must not be sent while SRD is enabled. SRD must be completely disabled before a DDI A AUX channel transaction can be sent." BSpec: 7530
Cc Rodrigo Vivi <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 9 ++++++++ drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_psr.c | 6 +++++ 4 files changed, 64 insertions(+)drivers/gpu/drm/i915/i915_reg.h +9
-0@@ -5318,6 +5318,7 @@ enum {#define _DPA_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6401c)#define _DPA_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64020)#define _DPA_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64024) +#define _DPA_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6402C)#define _DPB_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64110)#define _DPB_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64114)@@ -5325,6 +5326,7 @@ enum {#define _DPB_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6411c)#define _DPB_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64120)#define _DPB_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64124) +#define _DPB_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6412C)#define _DPC_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64210)#define _DPC_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64214)@@ -5332,6 +5334,7 @@ enum {#define _DPC_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6421c)#define _DPC_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64220)#define _DPC_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64224) +#define _DPC_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6422C)#define _DPD_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64310)#define _DPD_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64314)@@ -5339,6 +5342,7 @@ enum {#define _DPD_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6431c)#define _DPD_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64320)#define _DPD_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64324) +#define _DPD_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6432C)#define _DPF_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64510)#define _DPF_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64514)@@ -5346,9 +5350,11 @@ enum {#define _DPF_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6451c)#define _DPF_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64520)#define _DPF_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64524) +#define _DPF_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6452C)#define DP_AUX_CH_CTL (port) _MMIO_PORT(port, _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL)#define DP_AUX_CH_DATA (port, i) _MMIO(_PORT(port, _DPA_AUX_CH_DATA1, _DPB_AUX_CH_DATA1) + (i) * 4)/* 5 registers */ +#define DP_AUX_CH_MUTEX (port) _MMIO_PORT(port, _DPA_AUX_CH_MUTEX, _DPB_AUX_CH_MUTEX)#define DP_AUX_CH_CTL_SEND_BUSY (1 << 31)#define DP_AUX_CH_CTL_DONE (1 << 30)@@ -5378,6 +5384,9 @@ enum {#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1) +#define DP_AUX_CH_MUTEX_ENABLE (1 << 31) +#define DP_AUX_CH_MUTEX_STATUS (1 << 30) +/* * Computing GMCH M and N values for the Display Port link * drivers/gpu/drm/i915/intel_dp.c +48
-0@@ -1081,6 +1081,28 @@ static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, aux_clock_divider); } +static bool intel_dp_aux_get (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp) +{ +int try, ret; + +for (try =0 , ret =-1 ; try <3 && ret; try++) + ret =wait_for (!(I915_READ_NOTRACE (intel_dp->aux_ch_mutex_reg) + &DP_AUX_CH_MUTEX_STATUS ),0.5 ); + +return ret ==0 ; +} + +static void intel_dp_aux_put (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp) +{ +/* setting the status bit releases the mutex + keep set the bit +* to keep the mutex enabled. +*/ +I915_WRITE (intel_dp->aux_ch_mutex_reg,DP_AUX_CH_MUTEX_ENABLE | +DP_AUX_CH_MUTEX_STATUS ); +} + static int intel_dp_aux_ch(struct intel_dp *intel_dp, const uint8_t *send, int send_bytes,@@ -1115,6 +1137,21 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,intel_dp_check_edp (intel_dp); +/* Get hardware mutex when PSR is enabled */ +if (dev_priv->psr.enabled == intel_dp) { +if (intel_dp->aux_ch_mutex_reg.reg) { +if (intel_dp_aux_get (dev_priv, intel_dp)) { +DRM_WARN ("dp_aux_ch port locked for too long" ); + ret = -EBUSY ; + goto out_locked; + } + }else { +/* TODO: go to PSR exit state waiting for change before +* do a aux ch transaction. +*/ + } + } +/* Try to wait for any previous AUX channel activity */ for (try =0 ; try <3 ; try++) { status =I915_READ_NOTRACE (ch_ctl);@@ -1243,7 +1280,16 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, recv + i, recv_bytes - i); ret = recv_bytes; + out: +if (dev_priv->psr.enabled == intel_dp) { +if (intel_dp->aux_ch_mutex_reg.reg) +intel_dp_aux_put (dev_priv, intel_dp); + else +/* TODO: schedule PSR work to active PSR again */ + } + +out_locked:pm_qos_update_request (&dev_priv->pm_qos,PM_QOS_DEFAULT_VALUE );if (vdd)@@ -1496,6 +1542,8 @@ static void intel_aux_reg_init(struct intel_dp *intel_dp) intel_dp->aux_ch_ctl_reg =intel_aux_ctl_reg (dev_priv, port);for (i =0 ; i <ARRAY_SIZE (intel_dp->aux_ch_data_reg); i++) intel_dp->aux_ch_data_reg[i] =intel_aux_data_reg (dev_priv, port, i); +if (INTEL_INFO (dev_priv)->gen >=9 ) + intel_dp->aux_ch_mutex_reg =DP_AUX_CH_MUTEX (port); } static voiddrivers/gpu/drm/i915/intel_drv.h +1
-0@@ -1040,6 +1040,7 @@ struct intel_dp {i915_reg_t output_reg;i915_reg_t aux_ch_ctl_reg;i915_reg_t aux_ch_data_reg[5 ]; +i915_reg_t aux_ch_mutex_reg;uint32_t DP ;int link_rate;uint8_t lane_count;drivers/gpu/drm/i915/intel_psr.c +6
-0@@ -484,6 +484,9 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp,EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg,DP_AUX_CH_MUTEX_ENABLE ); }/** @@ -617,6 +620,9 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,else WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg, ~DP_AUX_CH_MUTEX_ENABLE ); }/**
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 4 lines · José Roberto de Souza
When PSR/PSR2 is enabled hardware can do AUX transactions by it self, so lets use the mutex register that is available in gen9+ to avoid concurrent access by hardware and driver.
Quoted 8 lines
Reference: https://01.org/sites/default/files/documentation/intel-gfx-prm-osrc-skl-vol12-display.pdf
Page 198 - AUX programming sequenceAs gen < 9 don't have the mutex PSR needs to be disabled, that is why the 'else TODO' was added. This is also backed by spec:
"DDI A AUX channel transactions must not be sent while SRD is enabled. SRD must be completely disabled before a DDI A AUX channel transaction can be sent." BSpec: 7530
We explicitly rejected the use of the hw mutex way back when Skylake was enabled. At that time the understanding was that the hw will try to do the arbitration itself. Has something changed?
Some comments inline.
Quoted 59 lines
Cc Rodrigo Vivi <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 9 ++++++++ drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_psr.c | 6 +++++ 4 files changed, 64 insertions(+)drivers/gpu/drm/i915/i915_reg.h +6
-0@@ -5318,6 +5318,7 @@ enum {#define _DPA_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6401c)#define _DPA_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64020)#define _DPA_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64024) +#define _DPA_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6402C)#define _DPB_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64110)#define _DPB_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64114)@@ -5325,6 +5326,7 @@ enum {#define _DPB_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6411c)#define _DPB_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64120)#define _DPB_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64124) +#define _DPB_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6412C)#define _DPC_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64210)#define _DPC_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64214)@@ -5332,6 +5334,7 @@ enum {#define _DPC_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6421c)#define _DPC_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64220)#define _DPC_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64224) +#define _DPC_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6422C)#define _DPD_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64310)#define _DPD_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64314)@@ -5339,6 +5342,7 @@ enum {#define _DPD_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6431c)#define _DPD_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64320)#define _DPD_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64324) +#define _DPD_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6432C)#define _DPF_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64510)#define _DPF_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64514)@@ -5346,9 +5350,11 @@ enum {#define _DPF_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6451c)#define _DPF_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64520)#define _DPF_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64524) +#define _DPF_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6452C)#define DP_AUX_CH_CTL (port) _MMIO_PORT(port, _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL)#define DP_AUX_CH_DATA (port, i) _MMIO(_PORT(port, _DPA_AUX_CH_DATA1, _DPB_AUX_CH_DATA1) + (i) * 4)/* 5 registers */ +#define DP_AUX_CH_MUTEX (port) _MMIO_PORT(port, _DPA_AUX_CH_MUTEX, _DPB_AUX_CH_MUTEX)#define DP_AUX_CH_CTL_SEND_BUSY (1 << 31)#define DP_AUX_CH_CTL_DONE (1 << 30)
drivers/gpu/drm/i915/i915_reg.h enum { · line 5388
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -5378,6 +5384,9 @@ enum {#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1) +#define DP_AUX_CH_MUTEX_ENABLE (1 << 31) +#define DP_AUX_CH_MUTEX_STATUS (1 << 30)
The bit definitions should immediately follow the register offset definition. I.e. DP_AUX_CH_MUTEX() should be right above these.
Quoted 9 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+/* * Computing GMCH M and N values for the Display Port link * drivers/gpu/drm/i915/intel_dp.c +0
-0
drivers/gpu/drm/i915/intel_dp.c static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, · line 1085
Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0@@ -1081,6 +1081,28 @@ static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, aux_clock_divider); } +static bool intel_dp_aux_get (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp)
You can get at dev_priv from intel_dp, please don't pass both.
The names _get/_put imply the calls can be nested, which is not the case here. Please use _lock/_unlock instead.
If the locking can fail, call it _trylock.
drivers/gpu/drm/i915/intel_dp.c static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, · line 1091
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +6
-0+{ +int try, ret; + +for (try =0 , ret =-1 ; try <3 && ret; try++) + ret =wait_for (!(I915_READ_NOTRACE (intel_dp->aux_ch_mutex_reg) + &DP_AUX_CH_MUTEX_STATUS ),0.5 );
0.5? Really?
What's the point of the loop around the wait_for? wait_for already loops with increasing delays in between the condition check.
Quoted 18 lines
drivers/gpu/drm/i915/intel_dp.c +14
-0+ +return ret ==0 ; +} + +static void intel_dp_aux_put (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp) +{ +/* setting the status bit releases the mutex + keep set the bit +* to keep the mutex enabled. +*/ +I915_WRITE (intel_dp->aux_ch_mutex_reg,DP_AUX_CH_MUTEX_ENABLE | +DP_AUX_CH_MUTEX_STATUS ); +} + static int intel_dp_aux_ch(struct intel_dp *intel_dp, const uint8_t *send, int send_bytes,
drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1142
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +3
-0@@ -1115,6 +1137,21 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,intel_dp_check_edp (intel_dp); +/* Get hardware mutex when PSR is enabled */ +if (dev_priv->psr.enabled == intel_dp) { +if (intel_dp->aux_ch_mutex_reg.reg) {
See i915_mmio_reg_valid(). But I'd rather the check was within the locking primitives.
Overall I think mixing all this PSR conditional stuff in the aux channel primitives is very, very wrong.
At the very least this is racy with PSR enabling/disabling.
Quoted 58 lines
drivers/gpu/drm/i915/intel_dp.c +23
-0+if (intel_dp_aux_get (dev_priv, intel_dp)) { +DRM_WARN ("dp_aux_ch port locked for too long" ); + ret = -EBUSY ; + goto out_locked; + } + }else { +/* TODO: go to PSR exit state waiting for change before +* do a aux ch transaction. +*/ + } + } +/* Try to wait for any previous AUX channel activity */ for (try =0 ; try <3 ; try++) { status =I915_READ_NOTRACE (ch_ctl);@@ -1243,7 +1280,16 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, recv + i, recv_bytes - i); ret = recv_bytes; + out: +if (dev_priv->psr.enabled == intel_dp) { +if (intel_dp->aux_ch_mutex_reg.reg) +intel_dp_aux_put (dev_priv, intel_dp); + else +/* TODO: schedule PSR work to active PSR again */ + } + +out_locked:pm_qos_update_request (&dev_priv->pm_qos,PM_QOS_DEFAULT_VALUE );if (vdd)@@ -1496,6 +1542,8 @@ static void intel_aux_reg_init(struct intel_dp *intel_dp) intel_dp->aux_ch_ctl_reg =intel_aux_ctl_reg (dev_priv, port);for (i =0 ; i <ARRAY_SIZE (intel_dp->aux_ch_data_reg); i++) intel_dp->aux_ch_data_reg[i] =intel_aux_data_reg (dev_priv, port, i); +if (INTEL_INFO (dev_priv)->gen >=9 ) + intel_dp->aux_ch_mutex_reg =DP_AUX_CH_MUTEX (port); } static voiddrivers/gpu/drm/i915/intel_drv.h +1
-0@@ -1040,6 +1040,7 @@ struct intel_dp {i915_reg_t output_reg;i915_reg_t aux_ch_ctl_reg;i915_reg_t aux_ch_data_reg[5 ]; +i915_reg_t aux_ch_mutex_reg;uint32_t DP ;int link_rate;uint8_t lane_count;drivers/gpu/drm/i915/intel_psr.c +0
-0
drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_enable_source(struct intel_dp *intel_dp, · line 489
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -484,6 +484,9 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp,EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg,DP_AUX_CH_MUTEX_ENABLE );
You can't just go stomping on the register without locking. Racy.
drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_disable(struct intel_dp *intel_dp, · line 625
Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0}/** @@ -617,6 +620,9 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,else WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg, ~DP_AUX_CH_MUTEX_ENABLE );
Are you sure you want to set all other bits than enable?
BR,
Jani.
Quoted 3 lines
drivers/gpu/drm/i915/intel_psr.c +0
-0}/**
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerQuoted 14 lines · Jani Nikula
Quoted 4 lines · José Roberto de Souza
When PSR/PSR2 is enabled hardware can do AUX transactions by it self, so lets use the mutex register that is available in gen9+ to avoid concurrent access by hardware and driver.
Quoted 8 lines
Reference: https://01.org/sites/default/files/documentation/intel-gfx-prm-osrc-skl-vol12-display.pdf
Page 198 - AUX programming sequenceAs gen < 9 don't have the mutex PSR needs to be disabled, that is why the 'else TODO' was added. This is also backed by spec:
"DDI A AUX channel transactions must not be sent while SRD is enabled. SRD must be completely disabled before a DDI A AUX channel transaction can be sent." BSpec: 7530
Quoted 3 lines
We explicitly rejected the use of the hw mutex way back when Skylake was enabled. At that time the understanding was that the hw will try to do the arbitration itself. Has something changed?
By that time spec wasn't clear about the actual need or its reliability. Nowdays spec is clear that that is absolutely needed for PSR/PSR2/GTC.
Also we were using a lot of SW tracking and nowadays we are moving PSR to use more HW tracking.
So I believe we should add this to get a stable PSR.
Quoted 219 lines
Some comments inline.
Quoted 59 lines
Cc Rodrigo Vivi <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 9 ++++++++ drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_psr.c | 6 +++++ 4 files changed, 64 insertions(+)drivers/gpu/drm/i915/i915_reg.h +6
-0@@ -5318,6 +5318,7 @@ enum {#define _DPA_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6401c)#define _DPA_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64020)#define _DPA_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64024) +#define _DPA_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6402C)#define _DPB_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64110)#define _DPB_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64114)@@ -5325,6 +5326,7 @@ enum {#define _DPB_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6411c)#define _DPB_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64120)#define _DPB_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64124) +#define _DPB_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6412C)#define _DPC_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64210)#define _DPC_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64214)@@ -5332,6 +5334,7 @@ enum {#define _DPC_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6421c)#define _DPC_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64220)#define _DPC_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64224) +#define _DPC_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6422C)#define _DPD_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64310)#define _DPD_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64314)@@ -5339,6 +5342,7 @@ enum {#define _DPD_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6431c)#define _DPD_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64320)#define _DPD_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64324) +#define _DPD_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6432C)#define _DPF_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64510)#define _DPF_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64514)@@ -5346,9 +5350,11 @@ enum {#define _DPF_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6451c)#define _DPF_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64520)#define _DPF_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64524) +#define _DPF_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6452C)#define DP_AUX_CH_CTL (port) _MMIO_PORT(port, _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL)#define DP_AUX_CH_DATA (port, i) _MMIO(_PORT(port, _DPA_AUX_CH_DATA1, _DPB_AUX_CH_DATA1) + (i) * 4)/* 5 registers */ +#define DP_AUX_CH_MUTEX (port) _MMIO_PORT(port, _DPA_AUX_CH_MUTEX, _DPB_AUX_CH_MUTEX)#define DP_AUX_CH_CTL_SEND_BUSY (1 << 31)#define DP_AUX_CH_CTL_DONE (1 << 30)drivers/gpu/drm/i915/i915_reg.h enum { · line 5388
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -5378,6 +5384,9 @@ enum {#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1) +#define DP_AUX_CH_MUTEX_ENABLE (1 << 31) +#define DP_AUX_CH_MUTEX_STATUS (1 << 30)The bit definitions should immediately follow the register offset definition. I.e.
DP_AUX_CH_MUTEX()should be right above these.Quoted 9 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+/* * Computing GMCH M and N values for the Display Port link * drivers/gpu/drm/i915/intel_dp.c +0
-0drivers/gpu/drm/i915/intel_dp.c static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, · line 1085
Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0@@ -1081,6 +1081,28 @@ static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, aux_clock_divider); } +static bool intel_dp_aux_get (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp)You can get at
dev_privfromintel_dp, please don't pass both.The names _get/_put imply the calls can be nested, which is not the case here. Please use _lock/_unlock instead.
If the locking can fail, call it
_trylock.drivers/gpu/drm/i915/intel_dp.c static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, · line 1091
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +6
-0+{ +int try, ret; + +for (try =0 , ret =-1 ; try <3 && ret; try++) + ret =wait_for (!(I915_READ_NOTRACE (intel_dp->aux_ch_mutex_reg) + &DP_AUX_CH_MUTEX_STATUS ),0.5 );0.5? Really?
What's the point of the loop around the
wait_for?wait_foralready loops with increasing delays in between the condition check.Quoted 18 lines
drivers/gpu/drm/i915/intel_dp.c +14
-0+ +return ret ==0 ; +} + +static void intel_dp_aux_put (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp) +{ +/* setting the status bit releases the mutex + keep set the bit +* to keep the mutex enabled. +*/ +I915_WRITE (intel_dp->aux_ch_mutex_reg,DP_AUX_CH_MUTEX_ENABLE | +DP_AUX_CH_MUTEX_STATUS ); +} + static int intel_dp_aux_ch(struct intel_dp *intel_dp, const uint8_t *send, int send_bytes,drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1142
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +3
-0@@ -1115,6 +1137,21 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,intel_dp_check_edp (intel_dp); +/* Get hardware mutex when PSR is enabled */ +if (dev_priv->psr.enabled == intel_dp) { +if (intel_dp->aux_ch_mutex_reg.reg) {See
i915_mmio_reg_valid(). But I'd rather the check was within the locking primitives.Overall I think mixing all this PSR conditional stuff in the aux channel primitives is very, very wrong.
At the very least this is racy with PSR enabling/disabling.
Quoted 58 lines
drivers/gpu/drm/i915/intel_dp.c +23
-0+if (intel_dp_aux_get (dev_priv, intel_dp)) { +DRM_WARN ("dp_aux_ch port locked for too long" ); + ret = -EBUSY ; + goto out_locked; + } + }else { +/* TODO: go to PSR exit state waiting for change before +* do a aux ch transaction. +*/ + } + } +/* Try to wait for any previous AUX channel activity */ for (try =0 ; try <3 ; try++) { status =I915_READ_NOTRACE (ch_ctl);@@ -1243,7 +1280,16 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, recv + i, recv_bytes - i); ret = recv_bytes; + out: +if (dev_priv->psr.enabled == intel_dp) { +if (intel_dp->aux_ch_mutex_reg.reg) +intel_dp_aux_put (dev_priv, intel_dp); + else +/* TODO: schedule PSR work to active PSR again */ + } + +out_locked:pm_qos_update_request (&dev_priv->pm_qos,PM_QOS_DEFAULT_VALUE );if (vdd)@@ -1496,6 +1542,8 @@ static void intel_aux_reg_init(struct intel_dp *intel_dp) intel_dp->aux_ch_ctl_reg =intel_aux_ctl_reg (dev_priv, port);for (i =0 ; i <ARRAY_SIZE (intel_dp->aux_ch_data_reg); i++) intel_dp->aux_ch_data_reg[i] =intel_aux_data_reg (dev_priv, port, i); +if (INTEL_INFO (dev_priv)->gen >=9 ) + intel_dp->aux_ch_mutex_reg =DP_AUX_CH_MUTEX (port); } static voiddrivers/gpu/drm/i915/intel_drv.h +1
-0@@ -1040,6 +1040,7 @@ struct intel_dp {i915_reg_t output_reg;i915_reg_t aux_ch_ctl_reg;i915_reg_t aux_ch_data_reg[5 ]; +i915_reg_t aux_ch_mutex_reg;uint32_t DP ;int link_rate;uint8_t lane_count;drivers/gpu/drm/i915/intel_psr.c +0
-0drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_enable_source(struct intel_dp *intel_dp, · line 489
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -484,6 +484,9 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp,EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg,DP_AUX_CH_MUTEX_ENABLE );You can't just go stomping on the register without locking. Racy.
drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_disable(struct intel_dp *intel_dp, · line 625
Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0}/** @@ -617,6 +620,9 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,else WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg, ~DP_AUX_CH_MUTEX_ENABLE );Are you sure you want to set all other bits than enable?
Quoted 9 lines
BR,
Jani.Quoted 3 lines
drivers/gpu/drm/i915/intel_psr.c +0
-0}/** Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 19 lines · Rodrigo Vivi
Quoted 14 lines · Jani Nikula
Quoted 4 lines · José Roberto de Souza
When PSR/PSR2 is enabled hardware can do AUX transactions by it self, so lets use the mutex register that is available in gen9+ to avoid concurrent access by hardware and driver.
Quoted 8 lines
Reference: https://01.org/sites/default/files/documentation/intel-gfx-prm-osrc-skl-vol12-display.pdf
Page 198 - AUX programming sequenceAs gen < 9 don't have the mutex PSR needs to be disabled, that is why the 'else TODO' was added. This is also backed by spec:
"DDI A AUX channel transactions must not be sent while SRD is enabled. SRD must be completely disabled before a DDI A AUX channel transaction can be sent." BSpec: 7530Quoted 3 lines
We explicitly rejected the use of the hw mutex way back when Skylake was enabled. At that time the understanding was that the hw will try to do the arbitration itself. Has something changed?
Quoted 7 lines
By that time spec wasn't clear about the actual need or its reliability. Nowdays spec is clear that that is absolutely needed for PSR/PSR2/GTC.
Also we were using a lot of SW tracking and nowadays we are moving PSR to use more HW tracking.
So I believe we should add this to get a stable PSR.
Fair enough. The patch at hand needs a bunch of work though.
BR,
Jani.
Quoted 229 lines
Quoted 229 lines
Some comments inline.
Quoted 59 lines
Cc Rodrigo Vivi <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 9 ++++++++ drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_psr.c | 6 +++++ 4 files changed, 64 insertions(+)drivers/gpu/drm/i915/i915_reg.h +6
-0@@ -5318,6 +5318,7 @@ enum {#define _DPA_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6401c)#define _DPA_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64020)#define _DPA_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64024) +#define _DPA_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6402C)#define _DPB_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64110)#define _DPB_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64114)@@ -5325,6 +5326,7 @@ enum {#define _DPB_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6411c)#define _DPB_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64120)#define _DPB_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64124) +#define _DPB_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6412C)#define _DPC_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64210)#define _DPC_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64214)@@ -5332,6 +5334,7 @@ enum {#define _DPC_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6421c)#define _DPC_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64220)#define _DPC_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64224) +#define _DPC_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6422C)#define _DPD_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64310)#define _DPD_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64314)@@ -5339,6 +5342,7 @@ enum {#define _DPD_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6431c)#define _DPD_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64320)#define _DPD_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64324) +#define _DPD_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6432C)#define _DPF_AUX_CH_CTL (dev_priv->info.display_mmio_offset + 0x64510)#define _DPF_AUX_CH_DATA1 (dev_priv->info.display_mmio_offset + 0x64514)@@ -5346,9 +5350,11 @@ enum {#define _DPF_AUX_CH_DATA3 (dev_priv->info.display_mmio_offset + 0x6451c)#define _DPF_AUX_CH_DATA4 (dev_priv->info.display_mmio_offset + 0x64520)#define _DPF_AUX_CH_DATA5 (dev_priv->info.display_mmio_offset + 0x64524) +#define _DPF_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6452C)#define DP_AUX_CH_CTL (port) _MMIO_PORT(port, _DPA_AUX_CH_CTL, _DPB_AUX_CH_CTL)#define DP_AUX_CH_DATA (port, i) _MMIO(_PORT(port, _DPA_AUX_CH_DATA1, _DPB_AUX_CH_DATA1) + (i) * 4)/* 5 registers */ +#define DP_AUX_CH_MUTEX (port) _MMIO_PORT(port, _DPA_AUX_CH_MUTEX, _DPB_AUX_CH_MUTEX)#define DP_AUX_CH_CTL_SEND_BUSY (1 << 31)#define DP_AUX_CH_CTL_DONE (1 << 30)drivers/gpu/drm/i915/i915_reg.h enum { · line 5388
Quoted 5 lines
drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -5378,6 +5384,9 @@ enum {#define DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL (c) (((c) - 1) << 5)#define DP_AUX_CH_CTL_SYNC_PULSE_SKL (c) ((c) - 1) +#define DP_AUX_CH_MUTEX_ENABLE (1 << 31) +#define DP_AUX_CH_MUTEX_STATUS (1 << 30)The bit definitions should immediately follow the register offset definition. I.e.
DP_AUX_CH_MUTEX()should be right above these.Quoted 9 lines
drivers/gpu/drm/i915/i915_reg.h +1
-0+/* * Computing GMCH M and N values for the Display Port link * drivers/gpu/drm/i915/intel_dp.c +0
-0drivers/gpu/drm/i915/intel_dp.c static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, · line 1085
Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +2
-0@@ -1081,6 +1081,28 @@ static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, aux_clock_divider); } +static bool intel_dp_aux_get (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp)You can get at
dev_privfromintel_dp, please don't pass both.The names _get/_put imply the calls can be nested, which is not the case here. Please use _lock/_unlock instead.
If the locking can fail, call it
_trylock.drivers/gpu/drm/i915/intel_dp.c static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, · line 1091
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +6
-0+{ +int try, ret; + +for (try =0 , ret =-1 ; try <3 && ret; try++) + ret =wait_for (!(I915_READ_NOTRACE (intel_dp->aux_ch_mutex_reg) + &DP_AUX_CH_MUTEX_STATUS ),0.5 );0.5? Really?
What's the point of the loop around the
wait_for?wait_foralready loops with increasing delays in between the condition check.Quoted 18 lines
drivers/gpu/drm/i915/intel_dp.c +14
-0+ +return ret ==0 ; +} + +static void intel_dp_aux_put (struct drm_i915_private *dev_priv, +struct intel_dp *intel_dp) +{ +/* setting the status bit releases the mutex + keep set the bit +* to keep the mutex enabled. +*/ +I915_WRITE (intel_dp->aux_ch_mutex_reg,DP_AUX_CH_MUTEX_ENABLE | +DP_AUX_CH_MUTEX_STATUS ); +} + static int intel_dp_aux_ch(struct intel_dp *intel_dp, const uint8_t *send, int send_bytes,drivers/gpu/drm/i915/intel_dp.c intel_dp_aux_ch(struct intel_dp *intel_dp, · line 1142
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +3
-0@@ -1115,6 +1137,21 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,intel_dp_check_edp (intel_dp); +/* Get hardware mutex when PSR is enabled */ +if (dev_priv->psr.enabled == intel_dp) { +if (intel_dp->aux_ch_mutex_reg.reg) {See
i915_mmio_reg_valid(). But I'd rather the check was within the locking primitives.Overall I think mixing all this PSR conditional stuff in the aux channel primitives is very, very wrong.
At the very least this is racy with PSR enabling/disabling.
Quoted 58 lines
drivers/gpu/drm/i915/intel_dp.c +23
-0+if (intel_dp_aux_get (dev_priv, intel_dp)) { +DRM_WARN ("dp_aux_ch port locked for too long" ); + ret = -EBUSY ; + goto out_locked; + } + }else { +/* TODO: go to PSR exit state waiting for change before +* do a aux ch transaction. +*/ + } + } +/* Try to wait for any previous AUX channel activity */ for (try =0 ; try <3 ; try++) { status =I915_READ_NOTRACE (ch_ctl);@@ -1243,7 +1280,16 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, recv + i, recv_bytes - i); ret = recv_bytes; + out: +if (dev_priv->psr.enabled == intel_dp) { +if (intel_dp->aux_ch_mutex_reg.reg) +intel_dp_aux_put (dev_priv, intel_dp); + else +/* TODO: schedule PSR work to active PSR again */ + } + +out_locked:pm_qos_update_request (&dev_priv->pm_qos,PM_QOS_DEFAULT_VALUE );if (vdd)@@ -1496,6 +1542,8 @@ static void intel_aux_reg_init(struct intel_dp *intel_dp) intel_dp->aux_ch_ctl_reg =intel_aux_ctl_reg (dev_priv, port);for (i =0 ; i <ARRAY_SIZE (intel_dp->aux_ch_data_reg); i++) intel_dp->aux_ch_data_reg[i] =intel_aux_data_reg (dev_priv, port, i); +if (INTEL_INFO (dev_priv)->gen >=9 ) + intel_dp->aux_ch_mutex_reg =DP_AUX_CH_MUTEX (port); } static voiddrivers/gpu/drm/i915/intel_drv.h +1
-0@@ -1040,6 +1040,7 @@ struct intel_dp {i915_reg_t output_reg;i915_reg_t aux_ch_ctl_reg;i915_reg_t aux_ch_data_reg[5 ]; +i915_reg_t aux_ch_mutex_reg;uint32_t DP ;int link_rate;uint8_t lane_count;drivers/gpu/drm/i915/intel_psr.c +0
-0drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_enable_source(struct intel_dp *intel_dp, · line 489
Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0@@ -484,6 +484,9 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp,EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg,DP_AUX_CH_MUTEX_ENABLE );You can't just go stomping on the register without locking. Racy.
drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_disable(struct intel_dp *intel_dp, · line 625
Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +3
-0}/** @@ -617,6 +620,9 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,else WARN_ON (I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ); } + +if (intel_dp->aux_ch_mutex_reg.reg) +I915_WRITE (intel_dp->aux_ch_mutex_reg, ~DP_AUX_CH_MUTEX_ENABLE );Are you sure you want to set all other bits than enable?
BR,
Jani.Quoted 3 lines
drivers/gpu/drm/i915/intel_psr.c +0
-0}/** Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx