drm/i915/bios: Split VBT parsing to global vs. panel specific parts

Parsing the panel specific data (anything that depends on panel_type)
from VBT is currently happening too early. Split the whole thing
into global vs. panel specific parts so that we can start doing
the panel specific parsing at a later time.

v2: Clarify that this is about panel_type (Jani)
    Split out the leak checks (Jani)

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220510104242.6099-12-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 3de20d18eae865437f7c57993ec9f79f306ef6ac..cc64119b52e696d45054f227bf403af4a422c345 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -2961,18 +2961,7 @@ 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);
@@ -2991,6 +2980,21 @@ 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 4709c4d298059d2babb42c6909369a05d0aec365..c744d75fa435fe74487a0de11f5822059ac9d55c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bios.h
+++ b/drivers/gpu/drm/i915/display/intel_bios.h
@@ -230,6 +230,7 @@ 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 9f105250f4749941eabb23f6215730249d81e995..7ad93afcc50c26f79d4c2f260e8777841869b084 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -9580,6 +9580,7 @@ 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)