[Intel-gfx] [PATCH 1/3] drm/i915: Handle SDEISR according to PCH rather than platform

[Lucas De Marchi]

On Tue, Nov 26, 2019 at 01:07:30PM -0800, Matt Roper wrote:
>The South Display is part of the PCH so we should technically be basing
>our port detection logic off the PCH in use rather than the platform
>generation.
>
>Cc: Lucas De Marchi <lucas.demarchi at intel.com>
>Signed-off-by: Matt Roper <matthew.d.roper at intel.com>


Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

Lucas De Marchi

>---
> drivers/gpu/drm/i915/display/intel_dp.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
>index 3123958e2081..ddf5bad1b969 100644
>--- a/drivers/gpu/drm/i915/display/intel_dp.c
>+++ b/drivers/gpu/drm/i915/display/intel_dp.c
>@@ -5487,7 +5487,7 @@ static bool icl_combo_port_connected(struct drm_i915_private *dev_priv,
> 	return I915_READ(SDEISR) & SDE_DDI_HOTPLUG_ICP(port);
> }
>
>-static bool icl_digital_port_connected(struct intel_encoder *encoder)
>+static bool icp_digital_port_connected(struct intel_encoder *encoder)
> {
> 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> 	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
>@@ -5525,9 +5525,9 @@ static bool __intel_digital_port_connected(struct intel_encoder *encoder)
> 			return g4x_digital_port_connected(encoder);
> 	}
>
>-	if (INTEL_GEN(dev_priv) >= 11)
>-		return icl_digital_port_connected(encoder);
>-	else if (IS_GEN(dev_priv, 10) || IS_GEN9_BC(dev_priv))
>+	if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
>+		return icp_digital_port_connected(encoder);
>+	else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT)
> 		return spt_digital_port_connected(encoder);
> 	else if (IS_GEN9_LP(dev_priv))
> 		return bxt_digital_port_connected(encoder);
>-- 
>2.23.0
>
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx at lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx