Skip to content

Commit 3a252ff

Browse files
committed
Merge tag 'drm-intel-next-2025-07-10' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next
Driver Changes: - DSI panel's version 2 mipi-sequences fix (Hans) Signed-off-by: Simona Vetter <[email protected]> From: Rodrigo Vivi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 9800bf6 + 11895f3 commit 3a252ff

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/gpu/drm/i915/display/intel_bios.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1939,7 +1939,7 @@ static int get_init_otp_deassert_fragment_len(struct intel_display *display,
19391939
int index, len;
19401940

19411941
if (drm_WARN_ON(display->drm,
1942-
!data || panel->vbt.dsi.seq_version != 1))
1942+
!data || panel->vbt.dsi.seq_version >= 3))
19431943
return 0;
19441944

19451945
/* index = 1 to skip sequence byte */
@@ -1962,7 +1962,7 @@ static int get_init_otp_deassert_fragment_len(struct intel_display *display,
19621962
}
19631963

19641964
/*
1965-
* Some v1 VBT MIPI sequences do the deassert in the init OTP sequence.
1965+
* Some v1/v2 VBT MIPI sequences do the deassert in the init OTP sequence.
19661966
* The deassert must be done before calling intel_dsi_device_ready, so for
19671967
* these devices we split the init OTP sequence into a deassert sequence and
19681968
* the actual init OTP part.
@@ -1973,9 +1973,9 @@ static void vlv_fixup_mipi_sequences(struct intel_display *display,
19731973
u8 *init_otp;
19741974
int len;
19751975

1976-
/* Limit this to v1 vid-mode sequences */
1976+
/* Limit this to v1/v2 vid-mode sequences */
19771977
if (panel->vbt.dsi.config->is_cmd_mode ||
1978-
panel->vbt.dsi.seq_version != 1)
1978+
panel->vbt.dsi.seq_version >= 3)
19791979
return;
19801980

19811981
/* Only do this if there are otp and assert seqs and no deassert seq */

0 commit comments

Comments
 (0)