Skip to content

Commit b8c6834

Browse files
committed
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: Dave 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
2 parents 6613476 + 84b5ece commit b8c6834

2 files changed

Lines changed: 1 addition & 3 deletions

File tree

drivers/gpu/drm/i915/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ subdir-ccflags-y += $(call cc-option, -Wunused-const-variable)
1717
subdir-ccflags-y += $(call cc-option, -Wpacked-not-aligned)
1818
subdir-ccflags-y += $(call cc-option, -Wformat-overflow)
1919
subdir-ccflags-y += $(call cc-option, -Wformat-truncation)
20-
subdir-ccflags-y += $(call cc-option, -Wstringop-overflow)
2120
subdir-ccflags-y += $(call cc-option, -Wstringop-truncation)
2221
# The following turn off the warnings enabled by -Wextra
2322
ifeq ($(findstring 2, $(KBUILD_EXTRA_WARN)),)

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,6 +1155,7 @@ static void gen11_dsi_powerup_panel(struct intel_encoder *encoder)
11551155
}
11561156

11571157
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_INIT_OTP);
1158+
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_ON);
11581159

11591160
/* ensure all panel commands dispatched before enabling transcoder */
11601161
wait_for_cmds_dispatched_to_panel(encoder);
@@ -1255,8 +1256,6 @@ static void gen11_dsi_enable(struct intel_atomic_state *state,
12551256
/* step6d: enable dsi transcoder */
12561257
gen11_dsi_enable_transcoder(encoder);
12571258

1258-
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_ON);
1259-
12601259
/* step7: enable backlight */
12611260
intel_backlight_enable(crtc_state, conn_state);
12621261
intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_BACKLIGHT_ON);

0 commit comments

Comments
 (0)