Skip to content

Commit 3638e6a

Browse files
committed
Merge tag 'drm-intel-fixes-2025-07-10' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes
Short summary of fixes: - 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 d7b8f8e + e778689 commit 3638e6a

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
@@ -1938,7 +1938,7 @@ static int get_init_otp_deassert_fragment_len(struct intel_display *display,
19381938
int index, len;
19391939

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

19441944
/* index = 1 to skip sequence byte */
@@ -1961,7 +1961,7 @@ static int get_init_otp_deassert_fragment_len(struct intel_display *display,
19611961
}
19621962

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

1975-
/* Limit this to v1 vid-mode sequences */
1975+
/* Limit this to v1/v2 vid-mode sequences */
19761976
if (panel->vbt.dsi.config->is_cmd_mode ||
1977-
panel->vbt.dsi.seq_version != 1)
1977+
panel->vbt.dsi.seq_version >= 3)
19781978
return;
19791979

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

0 commit comments

Comments
 (0)