drm/i915: Nuke pointless variable

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / display / intel_hotplug.c

diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
index 3f1d7b8..5c58c1e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
@@ -81,33 +81,12 @@
  *
  * It is only valid and used by digital port encoder.
  *
- * Return pin that is associatade with @port and HDP_NONE if no pin is
- * hard associated with that @port.
+ * Return pin that is associatade with @port.
  */
 enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv,
                                   enum port port)
 {
-       enum phy phy = intel_port_to_phy(dev_priv, port);
-
-       /*
-        * RKL + TGP PCH is a special case; we effectively choose the hpd_pin
-        * based on the DDI rather than the PHY (i.e., the last two outputs
-        * shold be HPD_PORT_{D,E} rather than {C,D}.  Note that this differs
-        * from the behavior of both TGL+TGP and RKL+CMP.
-        */
-       if (IS_ROCKETLAKE(dev_priv) && HAS_PCH_TGP(dev_priv))
-               return HPD_PORT_A + port - PORT_A;
-
-       switch (phy) {
-       case PHY_F:
-               return IS_CNL_WITH_PORT_F(dev_priv) ? HPD_PORT_E : HPD_PORT_F;
-       case PHY_A ... PHY_E:
-       case PHY_G ... PHY_I:
-               return HPD_PORT_A + phy - PHY_A;
-       default:
-               MISSING_CASE(phy);
-               return HPD_NONE;
-       }
+       return HPD_PORT_A + port - PORT_A;
 }
 
 #define HPD_STORM_DETECT_PERIOD                1000
@@ -503,7 +482,6 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
         * only the one of them (DP) will have ->hpd_pulse().
         */
        for_each_intel_encoder(&dev_priv->drm, encoder) {
-               bool has_hpd_pulse = intel_encoder_has_hpd_pulse(encoder);
                enum port port = encoder->port;
                bool long_hpd;
 
@@ -511,7 +489,7 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
                if (!(BIT(pin) & pin_mask))
                        continue;
 
-               if (!has_hpd_pulse)
+               if (!intel_encoder_has_hpd_pulse(encoder))
                        continue;
 
                long_hpd = long_mask & BIT(pin);