drm/i915: Nuke dev_priv->irq_port[]

Instead of looping over ports and hpd_pins, let's loop over
the encoders when doing hotplug processing. And instead of
depending on dev_priv->irq_port[] to tell us whether the
encoder has the ->hpd_pulse() hook or not, we can just
check for that directly. So we can just nuke irq_port[] entirely.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180705164357.28512-5-ville.syrjala@linux.intel.com
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f519485fcd7363d1771743a795caf76fd475c7f5..059cef73eb288a67828c6e9fb3fd14181c9d6a7f 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -299,7 +299,6 @@ struct i915_hotplug {
        u32 event_bits;
        struct delayed_work reenable_work;
 
-       struct intel_digital_port *irq_port[I915_MAX_PORTS];
        u32 long_port_mask;
        u32 short_port_mask;
        struct work_struct dig_port_work;

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index e4caa902d88e251bbaac5d81fc43e47bcbb33270..39d66f8493faea5162fd88315c7e709e4d51350d 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -3639,7 +3639,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
                        goto err;
 
                intel_dig_port->hpd_pulse = intel_dp_hpd_pulse;
-               dev_priv->hotplug.irq_port[port] = intel_dig_port;
        }
 
        /* In theory we don't need the encoder->type check, but leave it just in

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 18bcdab24baa50283e1fe1746211b860cdd63ba1..fc05c82265511bd8b5df387c1af65fb495a750d6 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -6464,7 +6464,6 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
        intel_encoder->port = port;
 
        intel_dig_port->hpd_pulse = intel_dp_hpd_pulse;
-       dev_priv->hotplug.irq_port[port] = intel_dig_port;
 
        if (port != PORT_A)
                intel_infoframe_init(intel_dig_port);

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 33c15fbc9cc104bea578b62f71a7ee809d16da45..a45f6324dd9b5bdb4a8bde87a40618ff205b79d7 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -304,6 +304,8 @@ struct intel_panel {
        } backlight;
 };
 
+struct intel_digital_port;
+
 /*
  * This structure serves as a translation layer between the generic HDCP code
  * and the bus-specific code. What that means is that HDCP over HDMI differs

diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c
index 43aa92beff2a691b8fe9ea0e00e1721680c73d2a..f862441158e1b39a18feef943a3ddf17cab3acca 100644 (file)
--- a/drivers/gpu/drm/i915/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/intel_hotplug.c
@@ -301,13 +301,18 @@ bool intel_encoder_hotplug(struct intel_encoder *encoder,
        return true;
 }
 
+static bool intel_encoder_has_hpd_pulse(struct intel_encoder *encoder)
+{
+       return intel_encoder_is_dig_port(encoder) &&
+               enc_to_dig_port(&encoder->base)->hpd_pulse != NULL;
+}
+
 static void i915_digport_work_func(struct work_struct *work)
 {
        struct drm_i915_private *dev_priv =
                container_of(work, struct drm_i915_private, hotplug.dig_port_work);
        u32 long_port_mask, short_port_mask;
-       struct intel_digital_port *intel_dig_port;
-       int i;
+       struct intel_encoder *encoder;
        u32 old_bits = 0;
 
        spin_lock_irq(&dev_priv->irq_lock);
@@ -317,27 +322,27 @@ static void i915_digport_work_func(struct work_struct *work)
        dev_priv->hotplug.short_port_mask = 0;
        spin_unlock_irq(&dev_priv->irq_lock);
 
-       for (i = 0; i < I915_MAX_PORTS; i++) {
-               bool valid = false;
-               bool long_hpd = false;
-               intel_dig_port = dev_priv->hotplug.irq_port[i];
-               if (!intel_dig_port || !intel_dig_port->hpd_pulse)
+       for_each_intel_encoder(&dev_priv->drm, encoder) {
+               struct intel_digital_port *dig_port;
+               enum port port = encoder->port;
+               bool long_hpd, short_hpd;
+               enum irqreturn ret;
+
+               if (!intel_encoder_has_hpd_pulse(encoder))
                        continue;
 
-               if (long_port_mask & (1 << i))  {
-                       valid = true;
-                       long_hpd = true;
-               } else if (short_port_mask & (1 << i))
-                       valid = true;
+               long_hpd = long_port_mask & BIT(port);
+               short_hpd = short_port_mask & BIT(port);
+
+               if (!long_hpd && !short_hpd)
+                       continue;
 
-               if (valid) {
-                       enum irqreturn ret;
+               dig_port = enc_to_dig_port(&encoder->base);
 
-                       ret = intel_dig_port->hpd_pulse(intel_dig_port, long_hpd);
-                       if (ret == IRQ_NONE) {
-                               /* fall back to old school hpd */
-                               old_bits |= (1 << intel_dig_port->base.hpd_pin);
-                       }
+               ret = dig_port->hpd_pulse(dig_port, long_hpd);
+               if (ret == IRQ_NONE) {
+                       /* fall back to old school hpd */
+                       old_bits |= BIT(encoder->hpd_pin);
                }
        }
 
@@ -418,26 +423,24 @@ static void i915_hotplug_work_func(struct work_struct *work)
 void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
                           u32 pin_mask, u32 long_mask)
 {
-       int i;
-       enum port port;
+       struct intel_encoder *encoder;
        bool storm_detected = false;
        bool queue_dig = false, queue_hp = false;
-       bool is_dig_port;
 
        if (!pin_mask)
                return;
 
        spin_lock(&dev_priv->irq_lock);
-       for_each_hpd_pin(i) {
+       for_each_intel_encoder(&dev_priv->drm, encoder) {
+               enum hpd_pin i = encoder->hpd_pin;
+               bool has_hpd_pulse = intel_encoder_has_hpd_pulse(encoder);
+
                if (!(BIT(i) & pin_mask))
                        continue;
 
-               port = intel_hpd_pin_to_port(dev_priv, i);
-               is_dig_port = port != PORT_NONE &&
-                       dev_priv->hotplug.irq_port[port];
-
-               if (is_dig_port) {
+               if (has_hpd_pulse) {
                        bool long_hpd = long_mask & BIT(i);
+                       enum port port = encoder->port;
 
                        DRM_DEBUG_DRIVER("digital hpd port %c - %s\n", port_name(port),
                                         long_hpd ? "long" : "short");
@@ -470,7 +473,7 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
                if (dev_priv->hotplug.stats[i].state != HPD_ENABLED)
                        continue;
 
-               if (!is_dig_port) {
+               if (!has_hpd_pulse) {
                        dev_priv->hotplug.event_bits |= BIT(i);
                        queue_hp = true;
                }