Commit 3a252ff9 authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge tag 'drm-intel-next-2025-07-10' of... 

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: default avatarSimona Vetter <simona.vetter@ffwll.ch>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/aHA-qrFQ00TaNsGr@intel.com
parents 9800bf6f 11895f37

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

+4 −4
Original line number Diff line number Diff line
@@ -1939,7 +1939,7 @@ static int get_init_otp_deassert_fragment_len(struct intel_display *display, 
	int index, len;



	if (drm_WARN_ON(display->drm,

			!data || panel->vbt.dsi.seq_version != 1))

			!data || panel->vbt.dsi.seq_version >= 3))

		return 0;



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



/*

 * Some v1 VBT MIPI sequences do the deassert in the init OTP sequence.

 * Some v1/v2 VBT MIPI sequences do the deassert in the init OTP sequence.

 * The deassert must be done before calling intel_dsi_device_ready, so for

 * these devices we split the init OTP sequence into a deassert sequence and

 * the actual init OTP part.
@@ -1973,9 +1973,9 @@ static void vlv_fixup_mipi_sequences(struct intel_display *display, 
	u8 *init_otp;

	int len;



	/* Limit this to v1 vid-mode sequences */

	/* Limit this to v1/v2 vid-mode sequences */

	if (panel->vbt.dsi.config->is_cmd_mode ||

	    panel->vbt.dsi.seq_version != 1)

	    panel->vbt.dsi.seq_version >= 3)

		return;



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