On Thu, Jul 05, 2018 at 07:43:50PM +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Add a convenience macro for iterating DP encoders.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_display.h | 4 ++++
> drivers/gpu/drm/i915/intel_dp.c | 38 +++++++-----------------------------
> drivers/gpu/drm/i915/intel_drv.h | 14 +++++++++++++
> 3 files changed, 25 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/intel_display.h
> index ca5a10f3400d..9292001cdd14 100644
> --- 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 5be07e1d816d..e95f1181e302 100644
> --- 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);
>
> @@ -3104,16 +3087,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 e09b42d91d1e..6fe3adafaf20 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1276,6 +1276,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)
> {
> --
> 2.16.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
