On Thu, Feb 03, 2022 at 08:38:20PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Often using pipes is more convenient than crtc indices.
> Convert the current for_each_intel_crtc_mask() to take a
> pipe mask instead of a crtc index mask, and rename it to
> for_each_intel_crtc_in_pipe_mask() to make it clear what
> it does.
>
> The current users of for_each_intel_crtc_mask() don't really
> care which kind of mask we use, but for other uses a pipe
> mask if better.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Manasi Navare <manasi.d.navare@xxxxxxxxx>
Manasi
> ---
> drivers/gpu/drm/i915/display/intel_display.h | 4 +--
> drivers/gpu/drm/i915/display/intel_dp.c | 34 ++++++++++----------
> 2 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index 22e5f0d6e171..fe9eb3acee65 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -430,11 +430,11 @@ enum hpd_pin {
> &(dev)->mode_config.crtc_list, \
> base.head)
>
> -#define for_each_intel_crtc_mask(dev, intel_crtc, crtc_mask) \
> +#define for_each_intel_crtc_in_pipe_mask(dev, intel_crtc, pipe_mask) \
> list_for_each_entry(intel_crtc, \
> &(dev)->mode_config.crtc_list, \
> base.head) \
> - for_each_if((crtc_mask) & drm_crtc_mask(&intel_crtc->base))
> + for_each_if((pipe_mask) & BIT(intel_crtc->pipe))
>
> #define for_each_intel_encoder(dev, intel_encoder) \
> list_for_each_entry(intel_encoder, \
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 146b83916005..3fb9f643ebb9 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -3810,14 +3810,14 @@ static bool intel_dp_has_connector(struct intel_dp *intel_dp,
>
> static int intel_dp_prep_link_retrain(struct intel_dp *intel_dp,
> struct drm_modeset_acquire_ctx *ctx,
> - u32 *crtc_mask)
> + u8 *pipe_mask)
> {
> struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> struct drm_connector_list_iter conn_iter;
> struct intel_connector *connector;
> int ret = 0;
>
> - *crtc_mask = 0;
> + *pipe_mask = 0;
>
> if (!intel_dp_needs_link_retrain(intel_dp))
> return 0;
> @@ -3851,12 +3851,12 @@ static int intel_dp_prep_link_retrain(struct intel_dp *intel_dp,
> !try_wait_for_completion(&conn_state->commit->hw_done))
> continue;
>
> - *crtc_mask |= drm_crtc_mask(&crtc->base);
> + *pipe_mask |= BIT(crtc->pipe);
> }
> drm_connector_list_iter_end(&conn_iter);
>
> if (!intel_dp_needs_link_retrain(intel_dp))
> - *crtc_mask = 0;
> + *pipe_mask = 0;
>
> return ret;
> }
> @@ -3875,7 +3875,7 @@ int intel_dp_retrain_link(struct intel_encoder *encoder,
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> struct intel_crtc *crtc;
> - u32 crtc_mask;
> + u8 pipe_mask;
> int ret;
>
> if (!intel_dp_is_connected(intel_dp))
> @@ -3886,17 +3886,17 @@ int intel_dp_retrain_link(struct intel_encoder *encoder,
> if (ret)
> return ret;
>
> - ret = intel_dp_prep_link_retrain(intel_dp, ctx, &crtc_mask);
> + ret = intel_dp_prep_link_retrain(intel_dp, ctx, &pipe_mask);
> if (ret)
> return ret;
>
> - if (crtc_mask == 0)
> + if (pipe_mask == 0)
> return 0;
>
> drm_dbg_kms(&dev_priv->drm, "[ENCODER:%d:%s] retraining link\n",
> encoder->base.base.id, encoder->base.name);
>
> - for_each_intel_crtc_mask(&dev_priv->drm, crtc, crtc_mask) {
> + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc, pipe_mask) {
> const struct intel_crtc_state *crtc_state =
> to_intel_crtc_state(crtc->base.state);
>
> @@ -3907,7 +3907,7 @@ int intel_dp_retrain_link(struct intel_encoder *encoder,
> intel_crtc_pch_transcoder(crtc), false);
> }
>
> - for_each_intel_crtc_mask(&dev_priv->drm, crtc, crtc_mask) {
> + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc, pipe_mask) {
> const struct intel_crtc_state *crtc_state =
> to_intel_crtc_state(crtc->base.state);
>
> @@ -3924,7 +3924,7 @@ int intel_dp_retrain_link(struct intel_encoder *encoder,
> break;
> }
>
> - for_each_intel_crtc_mask(&dev_priv->drm, crtc, crtc_mask) {
> + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc, pipe_mask) {
> const struct intel_crtc_state *crtc_state =
> to_intel_crtc_state(crtc->base.state);
>
> @@ -3942,14 +3942,14 @@ int intel_dp_retrain_link(struct intel_encoder *encoder,
>
> static int intel_dp_prep_phy_test(struct intel_dp *intel_dp,
> struct drm_modeset_acquire_ctx *ctx,
> - u32 *crtc_mask)
> + u8 *pipe_mask)
> {
> struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> struct drm_connector_list_iter conn_iter;
> struct intel_connector *connector;
> int ret = 0;
>
> - *crtc_mask = 0;
> + *pipe_mask = 0;
>
> drm_connector_list_iter_begin(&i915->drm, &conn_iter);
> for_each_intel_connector_iter(connector, &conn_iter) {
> @@ -3980,7 +3980,7 @@ static int intel_dp_prep_phy_test(struct intel_dp *intel_dp,
> !try_wait_for_completion(&conn_state->commit->hw_done))
> continue;
>
> - *crtc_mask |= drm_crtc_mask(&crtc->base);
> + *pipe_mask |= BIT(crtc->pipe);
> }
> drm_connector_list_iter_end(&conn_iter);
>
> @@ -3993,7 +3993,7 @@ static int intel_dp_do_phy_test(struct intel_encoder *encoder,
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> struct intel_crtc *crtc;
> - u32 crtc_mask;
> + u8 pipe_mask;
> int ret;
>
> ret = drm_modeset_lock(&dev_priv->drm.mode_config.connection_mutex,
> @@ -4001,17 +4001,17 @@ static int intel_dp_do_phy_test(struct intel_encoder *encoder,
> if (ret)
> return ret;
>
> - ret = intel_dp_prep_phy_test(intel_dp, ctx, &crtc_mask);
> + ret = intel_dp_prep_phy_test(intel_dp, ctx, &pipe_mask);
> if (ret)
> return ret;
>
> - if (crtc_mask == 0)
> + if (pipe_mask == 0)
> return 0;
>
> drm_dbg_kms(&dev_priv->drm, "[ENCODER:%d:%s] PHY test\n",
> encoder->base.base.id, encoder->base.name);
>
> - for_each_intel_crtc_mask(&dev_priv->drm, crtc, crtc_mask) {
> + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc, pipe_mask) {
> const struct intel_crtc_state *crtc_state =
> to_intel_crtc_state(crtc->base.state);
>
> --
> 2.34.1
>
