On Tue, 26 Apr 2022, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Move the panel specific VBT parsing to happen during the
> output probing stage. Needs to be done because the VBT
> parsing will need to look at the EDID to determine
> the correct panel_type on some machines.
>
> v2: Do intel_bios_init_panel() a bit earlier for vlv_dsi
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
This is a slightly annoying intermediate step for those rare machines
with multiple flat panels, mostly because of the debug printouts. Looks
like you've covered the leaks though.
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/icl_dsi.c | 2 ++
> drivers/gpu/drm/i915/display/intel_display.c | 1 -
> drivers/gpu/drm/i915/display/intel_dp.c | 2 ++
> drivers/gpu/drm/i915/display/intel_lvds.c | 2 ++
> drivers/gpu/drm/i915/display/intel_sdvo.c | 3 +++
> drivers/gpu/drm/i915/display/vlv_dsi.c | 2 ++
> 6 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
> index 19bf717fd4cb..baef44cd137f 100644
> --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> @@ -2049,6 +2049,8 @@ void icl_dsi_init(struct drm_i915_private *dev_priv)
> /* attach connector to encoder */
> intel_connector_attach_encoder(intel_connector, encoder);
>
> + intel_bios_init_panel(dev_priv);
> +
> mutex_lock(&dev->mode_config.mutex);
> intel_panel_add_vbt_lfp_fixed_mode(intel_connector);
> mutex_unlock(&dev->mode_config.mutex);
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index e33a70b980dc..0decf3d24237 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -9579,7 +9579,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)
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index a83dbbfc914c..5d8f6f233684 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -5185,6 +5185,8 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
> }
> intel_connector->edid = edid;
>
> + intel_bios_init_panel(dev_priv);
> +
> intel_panel_add_edid_fixed_modes(intel_connector,
> dev_priv->vbt.drrs_type != DRRS_TYPE_NONE);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
> index e8478161f8b9..554badf041f2 100644
> --- a/drivers/gpu/drm/i915/display/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/display/intel_lvds.c
> @@ -967,6 +967,8 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
> }
> intel_connector->edid = edid;
>
> + intel_bios_init_panel(dev_priv);
> +
> /* Try EDID first */
> intel_panel_add_edid_fixed_modes(intel_connector,
> dev_priv->vbt.drrs_type != DRRS_TYPE_NONE);
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index d81855d57cdc..84ac0f2162a4 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -2869,6 +2869,7 @@ static bool
> intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
> {
> struct drm_encoder *encoder = &intel_sdvo->base.base;
> + struct drm_i915_private *i915 = to_i915(encoder->dev);
> struct drm_connector *connector;
> struct intel_connector *intel_connector;
> struct intel_sdvo_connector *intel_sdvo_connector;
> @@ -2900,6 +2901,8 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
> if (!intel_sdvo_create_enhance_property(intel_sdvo, intel_sdvo_connector))
> goto err;
>
> + intel_bios_init_panel(i915);
> +
> /*
> * Fetch modes from VBT. For SDVO prefer the VBT mode since some
> * SDVO->LVDS transcoders can't cope with the EDID mode.
> diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
> index 1954f07f0d3e..08fb554ff7ad 100644
> --- a/drivers/gpu/drm/i915/display/vlv_dsi.c
> +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
> @@ -1929,6 +1929,8 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv)
> else
> intel_dsi->ports = BIT(port);
>
> + intel_bios_init_panel(dev_priv);
> +
> intel_dsi->dcs_backlight_ports = dev_priv->vbt.dsi.bl_ports;
> intel_dsi->dcs_cabc_ports = dev_priv->vbt.dsi.cabc_ports;
--
Jani Nikula, Intel Open Source Graphics Center
