lkml.org 
[lkml]   [2022]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 004/207] drm/i915/bios: Split VBT parsing to global vs. panel specific parts
    Date
    From: Ville Syrjälä <ville.syrjala@linux.intel.com>

    [ Upstream commit c2fdb424d32204faf5be29d55f0086b611c94e38 ]

    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
    Stable-dep-of: 607f41768a1e ("drm/i915/dsi: filter invalid backlight and CABC ports")
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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, 17 insertions(+), 11 deletions(-)

    diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
    index 5ceabc380808..d5cae64b916b 100644
    --- a/drivers/gpu/drm/i915/display/intel_bios.c
    +++ b/drivers/gpu/drm/i915/display/intel_bios.c
    @@ -2969,18 +2969,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);
    @@ -2999,6 +2988,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
    diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
    index 4709c4d29805..c744d75fa435 100644
    --- 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 806d50b302ab..e384db157f34 100644
    --- 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)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-26 14:16    [W:4.158 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site