drm/i915: Introduce for_each_intel_dp()

Add a convenience macro for iterating DP encoders.

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

diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/intel_display.h
index a77dd29db2ecbbf7c0fe68087a8f5c9ac41e081c..7559dfc235a2442b9de07977ef482cb08f93447a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.h
+++ b/drivers/gpu/drm/i915/intel_display.h
@@ -289,6 +289,10 @@ struct intel_link_m_n {
                            &(dev)->mode_config.encoder_list,   \
                            base.head)
 
+#define for_each_intel_dp(dev, intel_encoder)                  \
+       for_each_intel_encoder(dev, intel_encoder)              \
+               for_each_if(intel_encoder_is_dp(intel_encoder))
+
 #define for_each_intel_connector_iter(intel_connector, iter) \
        while ((intel_connector = to_intel_connector(drm_connector_list_iter_next(iter))))
 

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 7d40bfcb1bbb4343e8354d9147bf0aa9538071e1..f4662b2fb7ab42893d6336af3f82ecc5dbaf1d84 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -600,14 +600,8 @@ static enum pipe vlv_find_free_pps(struct drm_i915_private *dev_priv)
         * We don't have power sequencer currently.
         * Pick one that's not used by other ports.
         */
-       for_each_intel_encoder(&dev_priv->drm, encoder) {
-               struct intel_dp *intel_dp;
-
-               if (encoder->type != INTEL_OUTPUT_DP &&
-                   encoder->type != INTEL_OUTPUT_EDP)
-                       continue;
-
-               intel_dp = enc_to_intel_dp(&encoder->base);
+       for_each_intel_dp(&dev_priv->drm, encoder) {
+               struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
 
                if (encoder->type == INTEL_OUTPUT_EDP) {
                        WARN_ON(intel_dp->active_pipe != INVALID_PIPE &&
@@ -799,19 +793,8 @@ void intel_power_sequencer_reset(struct drm_i915_private *dev_priv)
         * should use them always.
         */
 
-       for_each_intel_encoder(&dev_priv->drm, encoder) {
-               struct intel_dp *intel_dp;
-
-               if (encoder->type != INTEL_OUTPUT_DP &&
-                   encoder->type != INTEL_OUTPUT_EDP &&
-                   encoder->type != INTEL_OUTPUT_DDI)
-                       continue;
-
-               intel_dp = enc_to_intel_dp(&encoder->base);
-
-               /* Skip pure DVI/HDMI DDI encoders */
-               if (!i915_mmio_reg_valid(intel_dp->output_reg))
-                       continue;
+       for_each_intel_dp(&dev_priv->drm, encoder) {
+               struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
 
                WARN_ON(intel_dp->active_pipe != INVALID_PIPE);
 
@@ -3097,16 +3080,9 @@ static void vlv_steal_power_sequencer(struct drm_i915_private *dev_priv,
 
        lockdep_assert_held(&dev_priv->pps_mutex);
 
-       for_each_intel_encoder(&dev_priv->drm, encoder) {
-               struct intel_dp *intel_dp;
-               enum port port;
-
-               if (encoder->type != INTEL_OUTPUT_DP &&
-                   encoder->type != INTEL_OUTPUT_EDP)
-                       continue;
-
-               intel_dp = enc_to_intel_dp(&encoder->base);
-               port = dp_to_dig_port(intel_dp)->base.port;
+       for_each_intel_dp(&dev_priv->drm, encoder) {
+               struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
+               enum port port = encoder->port;
 
                WARN(intel_dp->active_pipe == pipe,
                     "stealing pipe %c power sequencer from active (e)DP port %c\n",

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index a0e9a35b565823dad7d57c7fa788e89b8dac59a3..2740a0ef3f497043cd201762d75dd18a5c65bab0 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1275,6 +1275,20 @@ static inline struct intel_dp *enc_to_intel_dp(struct drm_encoder *encoder)
        return &enc_to_dig_port(encoder)->dp;
 }
 
+static inline bool intel_encoder_is_dp(struct intel_encoder *encoder)
+{
+       switch (encoder->type) {
+       case INTEL_OUTPUT_DP:
+       case INTEL_OUTPUT_EDP:
+               return true;
+       case INTEL_OUTPUT_DDI:
+               /* Skip pure HDMI/DVI DDI encoders */
+               return i915_mmio_reg_valid(enc_to_intel_dp(&encoder->base)->output_reg);
+       default:
+               return false;
+       }
+}
+
 static inline struct intel_digital_port *
 dp_to_dig_port(struct intel_dp *intel_dp)
 {