This is a note to let you know that I've just added the patch titled Revert "drm/i915/dsi: fix dual-link DSI backlight and CABC ports for display 11+" to the 5.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-drm-i915-dsi-fix-dual-link-dsi-backlight-and-cabc-ports-for-display-11.patch and it can be found in the queue-5.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Tue Oct 4 03:42:54 PM CEST 2022 From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Date: Tue, 4 Oct 2022 15:08:53 +0200 Subject: Revert "drm/i915/dsi: fix dual-link DSI backlight and CABC ports for display 11+" From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> This reverts commit f6bb739e61eb92bad3dcf4c336b91864d51f9503 which is commit 13393f65b77445d8b0f99c7b605cc9ccc936586f upstream. This is part of a series of i915 patches that were backported to 5.19.12 but found to be incomplete and caused problems on many systems so they are being reverted. Reported-by: Jerry Ling <jiling@xxxxxxx> Reported-by: Hans de Goede <hdegoede@xxxxxxxxxx> Cc: Thorsten Leemhuis <regressions@xxxxxxxxxxxxx> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Cc: Jani Nikula <jani.nikula@xxxxxxxxx> Cc: Stanislav Lisovskiy <stanislav.lisovskiy@xxxxxxxxx> Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> Cc: Sasha Levin <sashal@xxxxxxxxxx> Link: https://lore.kernel.org/all/55905860-adf9-312c-69cc-491ac8ce1a8b@xxxxxxx/ Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/i915/display/intel_bios.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -1473,8 +1473,6 @@ static void parse_dsi_backlight_ports(st struct intel_panel *panel, enum port port) { - enum port port_bc = DISPLAY_VER(i915) >= 11 ? PORT_B : PORT_C; - if (!panel->vbt.dsi.config->dual_link || i915->vbt.version < 197) { panel->vbt.dsi.bl_ports = BIT(port); if (panel->vbt.dsi.config->cabc_supported) @@ -1488,11 +1486,11 @@ static void parse_dsi_backlight_ports(st panel->vbt.dsi.bl_ports = BIT(PORT_A); break; case DL_DCS_PORT_C: - panel->vbt.dsi.bl_ports = BIT(port_bc); + panel->vbt.dsi.bl_ports = BIT(PORT_C); break; default: case DL_DCS_PORT_A_AND_C: - panel->vbt.dsi.bl_ports = BIT(PORT_A) | BIT(port_bc); + panel->vbt.dsi.bl_ports = BIT(PORT_A) | BIT(PORT_C); break; } @@ -1504,12 +1502,12 @@ static void parse_dsi_backlight_ports(st panel->vbt.dsi.cabc_ports = BIT(PORT_A); break; case DL_DCS_PORT_C: - panel->vbt.dsi.cabc_ports = BIT(port_bc); + panel->vbt.dsi.cabc_ports = BIT(PORT_C); break; default: case DL_DCS_PORT_A_AND_C: panel->vbt.dsi.cabc_ports = - BIT(PORT_A) | BIT(port_bc); + BIT(PORT_A) | BIT(PORT_C); break; } } Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are queue-5.19/revert-drm-i915-pps-split-pps_init_delays-into-distinct-parts.patch queue-5.19/revert-drm-i915-bios-split-vbt-data-into-per-panel-vs.-global-parts.patch queue-5.19/revert-drm-i915-extract-intel_edp_fixup_vbt_bpp.patch queue-5.19/revert-drm-i915-bios-split-vbt-parsing-to-global-vs.-panel-specific-parts.patch queue-5.19/revert-drm-i915-dsi-filter-invalid-backlight-and-cabc-ports.patch queue-5.19/revert-drm-i915-dsi-fix-dual-link-dsi-backlight-and-cabc-ports-for-display-11.patch queue-5.19/revert-drm-i915-display-fix-handling-of-enable_psr-parameter.patch queue-5.19/revert-drm-i915-bios-split-parse_driver_features-into-two-parts.patch