]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/i915: digital_port_connected sort platforms newer-to-older
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 22 Oct 2018 17:15:24 +0000 (10:15 -0700)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 22 Oct 2018 21:40:39 +0000 (14:40 -0700)
Just sorting this "if" block from newer to older platform.

The main difference here is the addition of a
missing case with return false that should never occur.
And if it occurs it is better than to raise a warn
than use the icl one.

The gen >= 11 was already present in the previous logic,
although hidden.

So, in summary no real functional change.

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181022171526.15641-3-rodrigo.vivi@intel.com
drivers/gpu/drm/i915/intel_dp.c

index 3384a9bbdafd1cd1981115450c71890df3f50412..8c38efef77a1d9607193e9f48544afac83792736 100644 (file)
@@ -5035,20 +5035,23 @@ bool intel_digital_port_connected(struct intel_encoder *encoder)
                        return g4x_digital_port_connected(encoder);
        }
 
-       if (IS_GEN5(dev_priv))
-               return ilk_digital_port_connected(encoder);
-       else if (IS_GEN6(dev_priv))
-               return snb_digital_port_connected(encoder);
-       else if (IS_GEN7(dev_priv))
-               return ivb_digital_port_connected(encoder);
-       else if (IS_GEN8(dev_priv))
-               return bdw_digital_port_connected(encoder);
+       if (INTEL_GEN(dev_priv) >= 11)
+               return icl_digital_port_connected(encoder);
+       else if (IS_GEN10(dev_priv) || IS_GEN9_BC(dev_priv))
+               return spt_digital_port_connected(encoder);
        else if (IS_GEN9_LP(dev_priv))
                return bxt_digital_port_connected(encoder);
-       else if (IS_GEN9_BC(dev_priv) || IS_GEN10(dev_priv))
-               return spt_digital_port_connected(encoder);
-       else
-               return icl_digital_port_connected(encoder);
+       else if (IS_GEN8(dev_priv))
+               return bdw_digital_port_connected(encoder);
+       else if (IS_GEN7(dev_priv))
+               return ivb_digital_port_connected(encoder);
+       else if (IS_GEN6(dev_priv))
+               return snb_digital_port_connected(encoder);
+       else if (IS_GEN5(dev_priv))
+               return ilk_digital_port_connected(encoder);
+
+       MISSING_CASE(INTEL_GEN(dev_priv));
+       return false;
 }
 
 static struct edid *