On Mon, May 04, 2020 at 03:52:19PM -0700, Matt Roper wrote:
> From: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
>
> RKL uses the DDI A, DDI B, DDI USBC1, DDI USBC2 from the DE point of
> view, so all DDI/pipe/transcoder register use these indexes to refer to
> them. Combo phy and IO functions follow another namespace that we keep
> as "enum phy". The VBT in theory would use the DE point of view, but
> that does not happen in practice.
>
> Provide a table to convert the child devices to the "correct" port
> numbering we use. Now this is the output we get while reading the VBT:
>
> DDIA:
> [drm:intel_bios_port_aux_ch [i915]] using AUX A for port A (VBT)
> [drm:intel_dp_init_connector [i915]] Adding DP connector on [ENCODER:275:DDI A]
> [drm:intel_hdmi_init_connector [i915]] Adding HDMI connector on [ENCODER:275:DDI A]
> [drm:intel_hdmi_init_connector [i915]] Using DDC pin 0x1 for port A (VBT)
>
> DDIB:
> [drm:intel_bios_port_aux_ch [i915]] using AUX B for port B (platform default)
> [drm:intel_hdmi_init_connector [i915]] Adding HDMI connector on [ENCODER:291:DDI B]
> [drm:intel_hdmi_init_connector [i915]] Using DDC pin 0x2 for port B (VBT)
>
> DDI USBC1:
> [drm:intel_bios_port_aux_ch [i915]] using AUX D for port D (VBT)
> [drm:intel_dp_init_connector [i915]] Adding DP connector on [ENCODER:295:DDI D]
> [drm:intel_hdmi_init_connector [i915]] Adding HDMI connector on [ENCODER:295:DDI D]
> [drm:intel_hdmi_init_connector [i915]] Using DDC pin 0x3 for port D (VBT)
>
> DDI USBC2:
> [drm:intel_bios_port_aux_ch [i915]] using AUX E for port E (VBT)
> [drm:intel_dp_init_connector [i915]] Adding DP connector on [ENCODER:306:DDI E]
> [drm:intel_hdmi_init_connector [i915]] Adding HDMI connector on [ENCODER:306:DDI E]
> [drm:intel_hdmi_init_connector [i915]] Using DDC pin 0x9 for port E (VBT)
>
> Cc: Clinton Taylor <Clinton.A.Taylor@xxxxxxxxx>
> Cc: Aditya Swarup <aditya.swarup@xxxxxxxxx>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
> Signed-off-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_bios.c | 72 ++++++++++++++++-------
> 1 file changed, 51 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> index 839124647202..4f1a72a90b8f 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -1619,30 +1619,18 @@ static u8 map_ddc_pin(struct drm_i915_private *dev_priv, u8 vbt_pin)
> return 0;
> }
>
> -static enum port dvo_port_to_port(u8 dvo_port)
> +static enum port __dvo_port_to_port(int n_ports, int n_dvo,
> + const int port_mapping[][3], u8 dvo_port)
> {
> - /*
> - * Each DDI port can have more than one value on the "DVO Port" field,
> - * so look for all the possible values for each port.
> - */
> - static const int dvo_ports[][3] = {
> - [PORT_A] = { DVO_PORT_HDMIA, DVO_PORT_DPA, -1},
> - [PORT_B] = { DVO_PORT_HDMIB, DVO_PORT_DPB, -1},
> - [PORT_C] = { DVO_PORT_HDMIC, DVO_PORT_DPC, -1},
> - [PORT_D] = { DVO_PORT_HDMID, DVO_PORT_DPD, -1},
> - [PORT_E] = { DVO_PORT_CRT, DVO_PORT_HDMIE, DVO_PORT_DPE},
> - [PORT_F] = { DVO_PORT_HDMIF, DVO_PORT_DPF, -1},
> - [PORT_G] = { DVO_PORT_HDMIG, DVO_PORT_DPG, -1},
> - };
> enum port port;
> int i;
>
> - for (port = PORT_A; port < ARRAY_SIZE(dvo_ports); port++) {
> - for (i = 0; i < ARRAY_SIZE(dvo_ports[port]); i++) {
> - if (dvo_ports[port][i] == -1)
> + for (port = PORT_A; port < n_ports; port++) {
> + for (i = 0; i < n_dvo; i++) {
> + if (port_mapping[port][i] == -1)
> break;
>
> - if (dvo_port == dvo_ports[port][i])
> + if (dvo_port == port_mapping[port][i])
> return port;
> }
> }
> @@ -1650,6 +1638,48 @@ static enum port dvo_port_to_port(u8 dvo_port)
> return PORT_NONE;
> }
>
> +static enum port dvo_port_to_port(struct drm_i915_private *dev_priv,
> + u8 dvo_port)
> +{
> + /*
> + * Each DDI port can have more than one value on the "DVO Port" field,
> + * so look for all the possible values for each port.
> + */
> + static const int port_mapping[][3] = {
> + [PORT_A] = { DVO_PORT_HDMIA, DVO_PORT_DPA, -1 },
> + [PORT_B] = { DVO_PORT_HDMIB, DVO_PORT_DPB, -1 },
> + [PORT_C] = { DVO_PORT_HDMIC, DVO_PORT_DPC, -1 },
> + [PORT_D] = { DVO_PORT_HDMID, DVO_PORT_DPD, -1 },
> + [PORT_E] = { DVO_PORT_CRT, DVO_PORT_HDMIE, -1 },
> + [PORT_F] = { DVO_PORT_HDMIF, DVO_PORT_DPF, -1 },
> + [PORT_G] = { DVO_PORT_HDMIG, DVO_PORT_DPG, -1 },
> + };
> + /*
> + * Bspec lists the ports as A, B, C, D - however internally in our
> + * driver we keep them as PORT_A, PORT_B, PORT_D and PORT_E so the
> + * registers in Display Engine match the right offsets. Apply the
> + * mapping here to translate from VBT to internal convention.
> + */
> + static const int rkl_port_mapping[][3] = {
> + [PORT_A] = { DVO_PORT_HDMIA, DVO_PORT_DPA, -1 },
> + [PORT_B] = { DVO_PORT_HDMIB, DVO_PORT_DPB, -1 },
> + [PORT_C] = { -1 },
> + [PORT_D] = { DVO_PORT_HDMIC, DVO_PORT_DPC, -1 },
> + [PORT_E] = { DVO_PORT_HDMID, DVO_PORT_DPD, -1 },
> + };
> +
> + if (IS_ROCKETLAKE(dev_priv))
> + return __dvo_port_to_port(ARRAY_SIZE(rkl_port_mapping),
> + ARRAY_SIZE(rkl_port_mapping[0]),
> + rkl_port_mapping,
> + dvo_port);
> + else
> + return __dvo_port_to_port(ARRAY_SIZE(port_mapping),
> + ARRAY_SIZE(port_mapping[0]),
> + port_mapping,
> + dvo_port);
> +}
What a horror show. To me it looks like we should just use the
phy here. Or would that break something else?
> +
> static void parse_ddi_port(struct drm_i915_private *dev_priv,
> struct display_device_data *devdata,
> u8 bdb_version)
> @@ -1659,7 +1689,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv,
> bool is_dvi, is_hdmi, is_dp, is_edp, is_crt;
> enum port port;
>
> - port = dvo_port_to_port(child->dvo_port);
> + port = dvo_port_to_port(dev_priv, child->dvo_port);
> if (port == PORT_NONE)
> return;
>
> @@ -2603,10 +2633,10 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv,
> aux_ch = AUX_CH_B;
> break;
> case DP_AUX_C:
> - aux_ch = AUX_CH_C;
> + aux_ch = IS_ROCKETLAKE(dev_priv) ? AUX_CH_D : AUX_CH_C;
> break;
> case DP_AUX_D:
> - aux_ch = AUX_CH_D;
> + aux_ch = IS_ROCKETLAKE(dev_priv) ? AUX_CH_E : AUX_CH_D;
> break;
> case DP_AUX_E:
> aux_ch = AUX_CH_E;
> --
> 2.24.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
