diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-29 18:41:37 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-29 18:41:37 +0200 |
| commit | 1e1f348380cca14d1da1e8107d2074df54ed30e4 (patch) | |
| tree | cf29c1a51fbf00b61f34373da8bdf2caede4dbb0 /drivers/gpu/drm | |
| parent | 68e51760bef9933fed5779ae49d98dbf9b321e54 (diff) | |
| parent | f48aeeaaa64c628519273f6007a745cf55b68d95 (diff) | |
Merge tag 'v5.15.109' into 5.15-2.2.x-imx
This is the 5.15.109 stable release
Conflicts:
arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_aux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux.c b/drivers/gpu/drm/i915/display/intel_dp_aux.c index f483f479dd0b..fd7527a3087f 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_aux.c +++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c @@ -167,7 +167,7 @@ static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp, DP_AUX_CH_CTL_TIME_OUT_MAX | DP_AUX_CH_CTL_RECEIVE_ERROR | (send_bytes << DP_AUX_CH_CTL_MESSAGE_SIZE_SHIFT) | - DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(32) | + DP_AUX_CH_CTL_FW_SYNC_PULSE_SKL(24) | DP_AUX_CH_CTL_SYNC_PULSE_SKL(32); if (intel_phy_is_tc(i915, phy) && |