This is a note to let you know that I've just added the patch titled Revert "drm/i915/bios: Split VBT parsing to global vs. panel specific parts" 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-bios-split-vbt-parsing-to-global-vs.-panel-specific-parts.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:17:36 +0200 Subject: Revert "drm/i915/bios: Split VBT parsing to global vs. panel specific parts" From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> This reverts commit 2af21ae876cf00800219f6f6d6245d081aeed47a which is commit c2fdb424d32204faf5be29d55f0086b611c94e38 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: 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 | 26 +++++++++++--------------- drivers/gpu/drm/i915/display/intel_bios.h | 1 - drivers/gpu/drm/i915/display/intel_display.c | 1 - 3 files changed, 11 insertions(+), 17 deletions(-) --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -2969,7 +2969,18 @@ void intel_bios_init(struct drm_i915_pri /* Grab useful general definitions */ parse_general_features(i915); parse_general_definitions(i915); + parse_panel_options(i915); + parse_generic_dtd(i915); + parse_lfp_data(i915); + parse_lfp_backlight(i915); + parse_sdvo_panel_data(i915); parse_driver_features(i915); + parse_panel_driver_features(i915); + parse_power_conservation_features(i915); + parse_edp(i915); + parse_psr(i915); + parse_mipi_config(i915); + parse_mipi_sequence(i915); /* Depends on child device list */ parse_compression_parameters(i915); @@ -2988,21 +2999,6 @@ out: kfree(oprom_vbt); } -void intel_bios_init_panel(struct drm_i915_private *i915) -{ - parse_panel_options(i915); - parse_generic_dtd(i915); - parse_lfp_data(i915); - parse_lfp_backlight(i915); - parse_sdvo_panel_data(i915); - parse_panel_driver_features(i915); - parse_power_conservation_features(i915); - parse_edp(i915); - parse_psr(i915); - parse_mipi_config(i915); - parse_mipi_sequence(i915); -} - /** * intel_bios_driver_remove - Free any resources allocated by intel_bios_init() * @i915: i915 device instance --- a/drivers/gpu/drm/i915/display/intel_bios.h +++ b/drivers/gpu/drm/i915/display/intel_bios.h @@ -230,7 +230,6 @@ struct mipi_pps_data { } __packed; void intel_bios_init(struct drm_i915_private *dev_priv); -void intel_bios_init_panel(struct drm_i915_private *dev_priv); void intel_bios_driver_remove(struct drm_i915_private *dev_priv); bool intel_bios_is_valid_vbt(const void *buf, size_t size); bool intel_bios_is_tv_present(struct drm_i915_private *dev_priv); --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -9580,7 +9580,6 @@ int intel_modeset_init_noirq(struct drm_ } intel_bios_init(i915); - intel_bios_init_panel(i915); ret = intel_vga_register(i915); if (ret) 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