diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-04 15:17:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-04 16:08:43 +0200 |
| commit | 3f2631ce3c8fe3f84102209f0ac2ee40feb7cbc9 (patch) | |
| tree | b18d296da45bec3d3ae5f8dbcee249c9ee602251 | |
| parent | 139d38c14725b1d8442ab3f4d7378deab7a761f1 (diff) | |
Revert "drm/i915/bios: Split VBT parsing to global vs. panel specific parts"
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@cern.ch>
Reported-by: Hans de Goede <hdegoede@redhat.com>
Cc: Thorsten Leemhuis <regressions@leemhuis.info>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Sasha Levin <sashal@kernel.org>
Link: https://lore.kernel.org/all/55905860-adf9-312c-69cc-491ac8ce1a8b@cern.ch/
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_bios.c | 26 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_bios.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 1 |
3 files changed, 11 insertions, 17 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index d5cae64b916b..5ceabc380808 100644 --- 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_private *i915) /* 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 diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h index c744d75fa435..4709c4d29805 100644 --- 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); diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index e384db157f34..806d50b302ab 100644 --- 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_i915_private *i915) } intel_bios_init(i915); - intel_bios_init_panel(i915); ret = intel_vga_register(i915); if (ret) |