drm/i915/skl+: Add and enable DP AUX CH mutex
Subsystems (2)
PATCH v6 1/1 drm/i915/skl+: Add and enable DP AUX CH mutex
When PSR/PSR2/GTC 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.
Older gen handling will be done separated.
Reference: https://01.org/sites/default/files/documentation/intel-gfx-prm-osrc-skl-vol12-display.pdf
Page 198 - AUX programming sequence
---
Changelog:
v2
- removed the PSR dependency, now getting lock all the times when available
- renamed functions to avoid nested calls
- moved register bits right after the DP_AUX_CH_MUTEX()
- removed 'drm/i915: keep AUX powered while PSR is enabled' Dhinakaran Pandiyan will sent a better and final version v3
- rebased on top of Ville's AUX series
- moved port registers to above DP_AUX_CH_MUTEX()
- using intel_wait_for_register() instead of the internal version
v4
- removed virtual function to get mutex register address
- enabling the mutex back only on aux channel init
- added the aux channel name to the timeout debug message
v5
- renamed DP_AUX_CH_MUTEX() parameter to aux_ch
- renamed goto label when intel_dp_aux_ch_trylock() fails
v6
- enabling mutex in the first trylock to cover all power management cases
- saving and restoring reserved bits in the mutex register
drivers/gpu/drm/i915/i915_reg.h | 9 +++++++ drivers/gpu/drm/i915/intel_dp.c | 58 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +9 -0
@@ -5388,6 +5388,15 @@ 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 _DPA_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6402C) +#define _DPB_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6412C) +#define _DPC_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6422C) +#define _DPD_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6432C) +#define _DPF_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6452C) +#define DP_AUX_CH_MUTEX (aux_ch) _MMIO_PORT(aux_ch, _DPA_AUX_CH_MUTEX, _DPB_AUX_CH_MUTEX) +#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 +58 -0
76 lines not on this page · raw message
Signature · 6 lines
2.16.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for drm/i915/skl+: Add and enable DP AUX CH mutex (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915/skl+: Add and enable DP AUX CH mutex (rev2)
URL : https://patchwork.freedesktop.org/series/39067/
State : warning
== Summary ==
Series 39067v2 drm/i915/skl+: Add and enable DP AUX CH mutex
https://patchwork.freedesktop.org/api/1.0/series/39067/revisions/2/mbox/
---- Possible new issues:
Test kms_force_connector_basic:
Subgroup prune-stale-modes:
pass -> SKIP (fi-snb-2520m)---- Known issues:
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
incomplete -> PASS (fi-snb-2520m) fdo#103713
Test prime_vgem:
Subgroup basic-fence-flip:
pass -> FAIL (fi-ilk-650) fdo#104008fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:422s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:424s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:370s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:500s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:277s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:486s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:485s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:480s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:479s fi-cfl-8700k total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:406s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:569s fi-cfl-u total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:515s fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:595s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:413s fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:289s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:516s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:405s fi-ilk-650 total:288 pass:227 dwarn:0 dfail:0 fail:1 skip:60 time:409s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:463s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:419s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:468s fi-kbl-7560u total:108 pass:104 dwarn:0 dfail:0 fail:0 skip:3 fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:461s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:505s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:590s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:435s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:516s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:530s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:495s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:492s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:423s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:426s fi-snb-2520m total:288 pass:247 dwarn:0 dfail:0 fail:0 skip:41 time:513s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:388s
72d7aac2959d8b0dcdbe6d5e7f072a07fbe2d377 drm-tip: 2018y-03m-06d-19h-09m-24s UTC integration manifest d3d3bfe8a349 drm/i915/skl+: Add and enable DP AUX CH mutex
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8249/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerQuoted 7 lines · José Roberto de Souza
When PSR/PSR2/GTC 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.
Older gen handling will be done separated.Reference: https://01.org/sites/default/files/documentation/intel-gfx-prm-osrc-skl-vol12-display.pdf
Page 198 - AUX programming sequence
Please let's drop this attempt and move without this while spec doesn't receive the proper updates HW teams are discussing.
Let's move our focus to get psr disabled when trying to use aux. (in a way that we don't kill sink_crc... at least while this is our only automated way to test PSR)
Thanks,
Rodrigo.
Quoted 139 lines
Cc Dhinakaran Pandiyan <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>---
Changelog:
v2
- removed the PSR dependency, now getting lock all the times when available
- renamed functions to avoid nested calls
- moved register bits right after theDP_AUX_CH_MUTEX()
- removed 'drm/i915: keep AUX powered while PSR is enabled' Dhinakaran Pandiyan will sent a better and final version v3
- rebased on top of Ville's AUX series
- moved port registers to aboveDP_AUX_CH_MUTEX()
- usingintel_wait_for_register()instead of the internal version
v4
- removed virtual function to get mutex register address
- enabling the mutex back only on aux channel init
- added the aux channel name to the timeout debug message
v5
- renamedDP_AUX_CH_MUTEX()parameter toaux_ch
- renamed goto label whenintel_dp_aux_ch_trylock()fails
v6
- enabling mutex in the first trylock to cover all power management cases
- saving and restoring reserved bits in the mutex registerdrivers/gpu/drm/i915/i915_reg.h | 9 +++++++ drivers/gpu/drm/i915/intel_dp.c | 58 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+)drivers/gpu/drm/i915/i915_reg.h +9
-0@@ -5388,6 +5388,15 @@ 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 _DPA_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6402C) +#define _DPB_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6412C) +#define _DPC_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6422C) +#define _DPD_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6432C) +#define _DPF_AUX_CH_MUTEX (dev_priv->info.display_mmio_offset + 0x6452C) +#define DP_AUX_CH_MUTEX (aux_ch) _MMIO_PORT(aux_ch, _DPA_AUX_CH_MUTEX, _DPB_AUX_CH_MUTEX) +#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 +58
-0@@ -1065,6 +1065,57 @@ static uint32_t skl_get_aux_send_ctl(struct intel_dp *intel_dp,DP_AUX_CH_CTL_SYNC_PULSE_SKL (32 ); } +static bool intel_dp_aux_ch_trylock (struct intel_dp *intel_dp) +{ +struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); +struct drm_i915_private *dev_priv = +to_i915 (intel_dig_port->base.base.dev); +u32 val; + +if (INTEL_GEN (dev_priv) <9 ) +return true; + +/* A read to mutex register will request the lock if mutex is enabled */ + val =I915_READ (DP_AUX_CH_MUTEX (intel_dp->aux_ch)); +if ((val &DP_AUX_CH_MUTEX_ENABLE ) ==0 ) { +/* Mutex is disabled, enables it */ +I915_WRITE (DP_AUX_CH_MUTEX (intel_dp->aux_ch), + val |DP_AUX_CH_MUTEX_ENABLE ); +/* Now that the mutex is enabled, request the lock */ + val =I915_READ (DP_AUX_CH_MUTEX (intel_dp->aux_ch)); + } + +/* Lock is acquired when status bit is unset */ +if ((val &DP_AUX_CH_MUTEX_STATUS ) ==0 ) +return true; + +/* Try to get the lock for 2msec(+-4 aux transactions) before give up */ +if (intel_wait_for_register (dev_priv,DP_AUX_CH_MUTEX (intel_dp->aux_ch), +DP_AUX_CH_MUTEX_STATUS ,0 ,2 )) { +DRM_DEBUG_KMS ("aux channel %c locked for 2msec, timing out\n" , +aux_ch_name (intel_dp->aux_ch)); +return false; + } + +return true; +} + +static void intel_dp_aux_ch_unlock (struct intel_dp *intel_dp) +{ +struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); +struct drm_i915_private *dev_priv = +to_i915 (intel_dig_port->base.base.dev); +u32 val; + +if (INTEL_GEN (dev_priv) <9 ) +return ; + +/* Set the status bit releases the mutex */ + val =I915_READ (DP_AUX_CH_MUTEX (intel_dp->aux_ch)); + val |=DP_AUX_CH_MUTEX_STATUS ; +I915_WRITE (DP_AUX_CH_MUTEX (intel_dp->aux_ch), val); +} + static int intel_dp_aux_xfer(struct intel_dp *intel_dp, const uint8_t *send, int send_bytes,@@ -1104,6 +1155,11 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp,intel_dp_check_edp (intel_dp); +if (!intel_dp_aux_ch_trylock (intel_dp)) { + ret = -EBUSY ; + goto out_aux_ch_unlocked; + } +/* Try to wait for any previous AUX channel activity */ for (try =0 ; try <3 ; try++) { status =I915_READ_NOTRACE (ch_ctl);@@ -1226,6 +1282,8 @@ intel_dp_aux_xfer(struct intel_dp *intel_dp, ret = recv_bytes; out: +intel_dp_aux_ch_unlock (intel_dp); +out_aux_ch_unlocked:pm_qos_update_request (&dev_priv->pm_qos,PM_QOS_DEFAULT_VALUE );if (vdd)Signature · 1 line
2.16.2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx