drm/i915/display: remove PORT_F workaround for CNL

Explicit support for CNL is being removed from the driver as it's not
expected to work. Remove the workaround for PORT_F from
display/intel_bios.c so we can also remove the generic DISPLAY_VER == 10
calls to intel_ddi_init(): the only platform with that display version
is already handled separately (GLK).

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210728215946.1573015-2-lucas.demarchi@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index aa667fa711584e1e18bbf06c2d7a49abc793c539..4172c8ee6aa6ea3e8d42f84db9516a0c33f32e18 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -1871,12 +1871,12 @@ intel_bios_encoder_supports_edp(const struct intel_bios_encoder_data *devdata)
 static bool is_port_valid(struct drm_i915_private *i915, enum port port)
 {
        /*
-        * On some ICL/CNL SKUs port F is not present, but broken VBTs mark
+        * On some ICL SKUs port F is not present, but broken VBTs mark
         * the port as present. Only try to initialize port F for the
         * SKUs that may actually have it.
         */
-       if (port == PORT_F && (IS_ICELAKE(i915) || IS_CANNONLAKE(i915)))
-               return IS_ICL_WITH_PORT_F(i915) || IS_CNL_WITH_PORT_F(i915);
+       if (port == PORT_F && IS_ICELAKE(i915))
+               return IS_ICL_WITH_PORT_F(i915);
 
        return true;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index ef4f8ef6622b2b55f7ae74842afa02a19ef8e488..aed4d4bf530aa6a666287df4ee3077ef795d851b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -11503,13 +11503,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
                intel_ddi_init(dev_priv, PORT_B);
                intel_ddi_init(dev_priv, PORT_C);
                vlv_dsi_init(dev_priv);
-       } else if (DISPLAY_VER(dev_priv) == 10) {
-               intel_ddi_init(dev_priv, PORT_A);
-               intel_ddi_init(dev_priv, PORT_B);
-               intel_ddi_init(dev_priv, PORT_C);
-               intel_ddi_init(dev_priv, PORT_D);
-               intel_ddi_init(dev_priv, PORT_E);
-               intel_ddi_init(dev_priv, PORT_F);
        } else if (DISPLAY_VER(dev_priv) >= 9) {
                intel_ddi_init(dev_priv, PORT_A);
                intel_ddi_init(dev_priv, PORT_B);