Commit b8c68345 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2024-01-19' of... 

Merge tag 'drm-intel-next-fixes-2024-01-19' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- DSI sequence revert to fix GitLab #10071 and DP test-pattern fix
- Drop -Wstringop-overflow (broken on GCC11)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZaozNnAGhu6Ec6cb@jlahtine-mobl.ger.corp.intel.com
parents 6613476e 84b5ece6

drivers/gpu/drm/i915/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ subdir-ccflags-y += $(call cc-option, -Wunused-const-variable) 
subdir-ccflags-y += $(call cc-option, -Wpacked-not-aligned)

subdir-ccflags-y += $(call cc-option, -Wformat-overflow)

subdir-ccflags-y += $(call cc-option, -Wformat-truncation)

subdir-ccflags-y += $(call cc-option, -Wstringop-overflow)

subdir-ccflags-y += $(call cc-option, -Wstringop-truncation)

# The following turn off the warnings enabled by -Wextra

ifeq ($(findstring 2, $(KBUILD_EXTRA_WARN)),)

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

+1 −2
Original line number Diff line number Diff line
@@ -1155,6 +1155,7 @@ static void gen11_dsi_powerup_panel(struct intel_encoder *encoder) 
	}



	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_INIT_OTP);

	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_ON);



	/* ensure all panel commands dispatched before enabling transcoder */

	wait_for_cmds_dispatched_to_panel(encoder);
@@ -1255,8 +1256,6 @@ static void gen11_dsi_enable(struct intel_atomic_state *state, 
	/* step6d: enable dsi transcoder */

	gen11_dsi_enable_transcoder(encoder);



	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_ON);



	/* step7: enable backlight */

	intel_backlight_enable(crtc_state, conn_state);

	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_BACKLIGHT_ON);