On Wed, 17 Mar 2021, Lucas De Marchi <lucas.demarchi@xxxxxxxxx> wrote:
> On Wed, Mar 17, 2021 at 06:36:49PM +0200, Jani Nikula wrote:
>>These will be exposed to the rest of the driver and replace other
>>functions. Everything will operate on the child devices.
>>
>>v2:
>>- Rebased, removed stray blank line
>>- Also abstracted intel_bios_encoder_supports_crt (Lucas)
>>
>>Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
>>Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>>Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>>---
>> drivers/gpu/drm/i915/display/intel_bios.c | 71 +++++++++++++++++++----
>> 1 file changed, 59 insertions(+), 12 deletions(-)
>>
>>diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
>>index 40fd60acd548..43cb5048ab9a 100644
>>--- a/drivers/gpu/drm/i915/display/intel_bios.c
>>+++ b/drivers/gpu/drm/i915/display/intel_bios.c
>>@@ -1795,6 +1795,59 @@ static int parse_bdb_216_dp_max_link_rate(const int vbt_max_link_rate)
>> }
>> }
>>
>>+static void sanitize_device_type(struct intel_bios_encoder_data *devdata,
>>+ enum port port)
>>+{
>>+ struct drm_i915_private *i915 = devdata->i915;
>>+ bool is_hdmi;
>>+
>>+ if (port != PORT_A || INTEL_GEN(i915) >= 12)
>>+ return;
>>+
>>+ if (!(devdata->child.device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING))
>>+ return;
>>+
>>+ is_hdmi = !(devdata->child.device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT);
>>+
>>+ drm_dbg_kms(&i915->drm, "VBT claims port A supports DVI%s, ignoring\n",
>>+ is_hdmi ? "/HDMI" : "");
>
> nit: a little more readable if this function uses the helpers you just
> defined:
>
>
> if (!intel_bios_encoder_supports_dvi(devdata))
> return;
>
> drm_dbg_kms(&i915->drm, "VBT claims port A supports DVI%s, ignoring\n",
> intel_bios_encoder_supports_hdmi(devdata) ? "/HDMI" : "");
>
>
> although the lines below are manipulating the device_type and may be
> good to let the constants here, too. Up to you.
I don't disagree, but saved this for future cleanup.
BR,
Jani.
>
> Reviewed-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
>
> Lucas De Marchi
>
>
>>+
>>+ devdata->child.device_type &= ~DEVICE_TYPE_TMDS_DVI_SIGNALING;
>>+ devdata->child.device_type |= DEVICE_TYPE_NOT_HDMI_OUTPUT;
>>+}
>>+
>>+static bool
>>+intel_bios_encoder_supports_crt(const struct intel_bios_encoder_data *devdata)
>>+{
>>+ return devdata->child.device_type & DEVICE_TYPE_ANALOG_OUTPUT;
>>+}
>>+
>>+static bool
>>+intel_bios_encoder_supports_dvi(const struct intel_bios_encoder_data *devdata)
>>+{
>>+ return devdata->child.device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;
>>+}
>>+
>>+static bool
>>+intel_bios_encoder_supports_hdmi(const struct intel_bios_encoder_data *devdata)
>>+{
>>+ return intel_bios_encoder_supports_dvi(devdata) &&
>>+ (devdata->child.device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
>>+}
>>+
>>+static bool
>>+intel_bios_encoder_supports_dp(const struct intel_bios_encoder_data *devdata)
>>+{
>>+ return devdata->child.device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT;
>>+}
>>+
>>+static bool
>>+intel_bios_encoder_supports_edp(const struct intel_bios_encoder_data *devdata)
>>+{
>>+ return intel_bios_encoder_supports_dp(devdata) &&
>>+ devdata->child.device_type & DEVICE_TYPE_INTERNAL_CONNECTOR;
>>+}
>>+
>> static void parse_ddi_port(struct drm_i915_private *i915,
>> struct intel_bios_encoder_data *devdata)
>> {
>>@@ -1816,19 +1869,13 @@ static void parse_ddi_port(struct drm_i915_private *i915,
>> return;
>> }
>>
>>- is_dvi = child->device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;
>>- is_dp = child->device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT;
>>- is_crt = child->device_type & DEVICE_TYPE_ANALOG_OUTPUT;
>>- is_hdmi = is_dvi && (child->device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
>>- is_edp = is_dp && (child->device_type & DEVICE_TYPE_INTERNAL_CONNECTOR);
>>+ sanitize_device_type(devdata, port);
>>
>>- if (port == PORT_A && is_dvi && INTEL_GEN(i915) < 12) {
>>- drm_dbg_kms(&i915->drm,
>>- "VBT claims port A supports DVI%s, ignoring\n",
>>- is_hdmi ? "/HDMI" : "");
>>- is_dvi = false;
>>- is_hdmi = false;
>>- }
>>+ is_dvi = intel_bios_encoder_supports_dvi(devdata);
>>+ is_dp = intel_bios_encoder_supports_dp(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);
>>
>> info->supports_dvi = is_dvi;
>> info->supports_hdmi = is_hdmi;
>>--
>>2.20.1
>>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
