[Intel-gfx] [PATCH 2/3] drm/i915: Populate encoder->devdata for DSI on icl+

[Ville Syrjälä]

On Tue, Feb 07, 2023 at 11:06:01AM +0200, Jani Nikula wrote:
> On Tue, 07 Feb 2023, Ville Syrjala <ville.syrjala at linux.intel.com> wrote:
> > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> >
> > We now have some eDP+DSI dual panel systems floating around
> > where the DSI panel is the secondary LFP and thus needs to
> > consult "panel type 2" in VBT in order to locate all the
> > other panel type dependante stuff correctly.
> >
> > To that end we need to pass in the devdata to
> > intel_bios_init_panel_late(), otherwise it'll just assume
> > we want the primary panel type. So let's try to just populate
> > the vbt.ports[] stuff and encoder->devdata for icl+ DSI
> > panels as well.
> >
> > We can't do this on older platforms as there we risk a DSI
> > port aliasing with a HDMI/DP port, which is a totally legal
> > thing as the DSI ports live in their own little parallel
> > universe.
> 
> Btw the series should probably be Cc: stable.

Slapped that on optimistically and pushed the lot.
Thanks for the review.

> 
> Reviewed-by: Jani Nikula <jani.nikula at intel.com>
> 
> >
> > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8016
> > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/icl_dsi.c    |  3 ++-
> >  drivers/gpu/drm/i915/display/intel_bios.c | 15 ++++++++++++---
> >  2 files changed, 14 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
> > index 003cac918228..05e749861658 100644
> > --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> > +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> > @@ -1951,7 +1951,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_late(dev_priv, &intel_connector->panel, NULL, NULL);
> > +	encoder->devdata = intel_bios_encoder_data_lookup(dev_priv, port);
> > +	intel_bios_init_panel_late(dev_priv, &intel_connector->panel, encoder->devdata, NULL);
> >  
> >  	mutex_lock(&dev_priv->drm.mode_config.mutex);
> >  	intel_panel_add_vbt_lfp_fixed_mode(intel_connector);
> > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> > index 06a2d98d2277..1cd8af88ce50 100644
> > --- a/drivers/gpu/drm/i915/display/intel_bios.c
> > +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> > @@ -2593,6 +2593,12 @@ intel_bios_encoder_supports_edp(const struct intel_bios_encoder_data *devdata)
> >  		devdata->child.device_type & DEVICE_TYPE_INTERNAL_CONNECTOR;
> >  }
> >  
> > +static bool
> > +intel_bios_encoder_supports_dsi(const struct intel_bios_encoder_data *devdata)
> > +{
> > +	return devdata->child.device_type & DEVICE_TYPE_MIPI_OUTPUT;
> > +}
> > +
> >  static int _intel_bios_hdmi_level_shift(const struct intel_bios_encoder_data *devdata)
> >  {
> >  	if (!devdata || devdata->i915->display.vbt.version < 158)
> > @@ -2643,7 +2649,7 @@ static void print_ddi_port(const struct intel_bios_encoder_data *devdata,
> >  {
> >  	struct drm_i915_private *i915 = devdata->i915;
> >  	const struct child_device_config *child = &devdata->child;
> > -	bool is_dvi, is_hdmi, is_dp, is_edp, is_crt, supports_typec_usb, supports_tbt;
> > +	bool is_dvi, is_hdmi, is_dp, is_edp, is_dsi, is_crt, supports_typec_usb, supports_tbt;
> >  	int dp_boost_level, dp_max_link_rate, hdmi_boost_level, hdmi_level_shift, max_tmds_clock;
> >  
> >  	is_dvi = intel_bios_encoder_supports_dvi(devdata);
> > @@ -2651,13 +2657,14 @@ static void print_ddi_port(const struct intel_bios_encoder_data *devdata,
> >  	is_crt = intel_bios_encoder_supports_crt(devdata);
> >  	is_hdmi = intel_bios_encoder_supports_hdmi(devdata);
> >  	is_edp = intel_bios_encoder_supports_edp(devdata);
> > +	is_dsi = intel_bios_encoder_supports_dsi(devdata);
> >  
> >  	supports_typec_usb = intel_bios_encoder_supports_typec_usb(devdata);
> >  	supports_tbt = intel_bios_encoder_supports_tbt(devdata);
> >  
> >  	drm_dbg_kms(&i915->drm,
> > -		    "Port %c VBT info: CRT:%d DVI:%d HDMI:%d DP:%d eDP:%d LSPCON:%d USB-Type-C:%d TBT:%d DSC:%d\n",
> > -		    port_name(port), is_crt, is_dvi, is_hdmi, is_dp, is_edp,
> > +		    "Port %c VBT info: CRT:%d DVI:%d HDMI:%d DP:%d eDP:%d DSI:%d LSPCON:%d USB-Type-C:%d TBT:%d DSC:%d\n",
> > +		    port_name(port), is_crt, is_dvi, is_hdmi, is_dp, is_edp, is_dsi,
> >  		    HAS_LSPCON(i915) && child->lspcon,
> >  		    supports_typec_usb, supports_tbt,
> >  		    devdata->dsc != NULL);
> > @@ -2710,6 +2717,8 @@ static void parse_ddi_port(struct intel_bios_encoder_data *devdata)
> >  	enum port port;
> >  
> >  	port = dvo_port_to_port(i915, child->dvo_port);
> > +	if (port == PORT_NONE && DISPLAY_VER(i915) >= 11)
> > +		port = dsi_dvo_port_to_port(i915, child->dvo_port);
> >  	if (port == PORT_NONE)
> >  		return;
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center

-- 
Ville Syrjälä
Intel