Commit c2fdb424 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

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: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220510104242.6099-12-ville.syrjala@linux.intel.com
parent c3fbcf60

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

+15 −11
Original line number Diff line number Diff line
@@ -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 @@ void intel_bios_init(struct drm_i915_private *i915) 
	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

drivers/gpu/drm/i915/display/intel_bios.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

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

+1 −0
Original line number Diff line number Diff line
@@ -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)