drm/i915: Populate encoder->devdata for DSI on icl+
[ Upstream commit14e591a193
] 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 dependant 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. Cc: stable@vger.kernel.org Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8016 Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230207064337.18697-3-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commitba00eb6a4b
) Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
bd61a84b5e
commit
783c225e91
|
@ -2053,7 +2053,8 @@ void icl_dsi_init(struct drm_i915_private *dev_priv)
|
||||||
/* attach connector to encoder */
|
/* attach connector to encoder */
|
||||||
intel_connector_attach_encoder(intel_connector, 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->mode_config.mutex);
|
mutex_lock(&dev->mode_config.mutex);
|
||||||
intel_panel_add_vbt_lfp_fixed_mode(intel_connector);
|
intel_panel_add_vbt_lfp_fixed_mode(intel_connector);
|
||||||
|
|
|
@ -2593,6 +2593,12 @@ intel_bios_encoder_supports_edp(const struct intel_bios_encoder_data *devdata)
|
||||||
devdata->child.device_type & DEVICE_TYPE_INTERNAL_CONNECTOR;
|
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)
|
static int _intel_bios_hdmi_level_shift(const struct intel_bios_encoder_data *devdata)
|
||||||
{
|
{
|
||||||
if (!devdata || devdata->i915->display.vbt.version < 158)
|
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;
|
struct drm_i915_private *i915 = devdata->i915;
|
||||||
const struct child_device_config *child = &devdata->child;
|
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;
|
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);
|
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_crt = intel_bios_encoder_supports_crt(devdata);
|
||||||
is_hdmi = intel_bios_encoder_supports_hdmi(devdata);
|
is_hdmi = intel_bios_encoder_supports_hdmi(devdata);
|
||||||
is_edp = intel_bios_encoder_supports_edp(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_typec_usb = intel_bios_encoder_supports_typec_usb(devdata);
|
||||||
supports_tbt = intel_bios_encoder_supports_tbt(devdata);
|
supports_tbt = intel_bios_encoder_supports_tbt(devdata);
|
||||||
|
|
||||||
drm_dbg_kms(&i915->drm,
|
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 %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,
|
port_name(port), is_crt, is_dvi, is_hdmi, is_dp, is_edp, is_dsi,
|
||||||
HAS_LSPCON(i915) && child->lspcon,
|
HAS_LSPCON(i915) && child->lspcon,
|
||||||
supports_typec_usb, supports_tbt,
|
supports_typec_usb, supports_tbt,
|
||||||
devdata->dsc != NULL);
|
devdata->dsc != NULL);
|
||||||
|
@ -2702,6 +2709,8 @@ static void parse_ddi_port(struct intel_bios_encoder_data *devdata)
|
||||||
enum port port;
|
enum port port;
|
||||||
|
|
||||||
port = dvo_port_to_port(i915, child->dvo_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)
|
if (port == PORT_NONE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue