On Thu, 20 Oct 2022, Suraj Kandpal <suraj.kandpal@xxxxxxxxx> wrote:
> Removing one use macro for_each_connector_on_encoder which
> is only being used at intel_encoder_find_connector.
Please use the imperative mood in commit message and subject. "Remove",
not "removing" or "removed".
With that,
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> Signed-off-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx>
> Reviewed-by: Arun R Murthy <arun.r.murthy@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.h | 4 ----
> .../gpu/drm/i915/display/intel_modeset_setup.c | 16 ++++++++++++----
> 2 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index 2af4a1925063..c803330a276d 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -469,10 +469,6 @@ enum hpd_pin {
> list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \
> for_each_if((intel_encoder)->base.crtc == (__crtc))
>
> -#define for_each_connector_on_encoder(dev, __encoder, intel_connector) \
> - list_for_each_entry((intel_connector), &(dev)->mode_config.connector_list, base.head) \
> - for_each_if((intel_connector)->base.encoder == (__encoder))
> -
> #define for_each_old_intel_plane_in_state(__state, plane, old_plane_state, __i) \
> for ((__i) = 0; \
> (__i) < (__state)->base.dev->mode_config.num_total_plane && \
> diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> index cbfabd58b75a..5f56e0335ff0 100644
> --- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> +++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c
> @@ -205,13 +205,21 @@ static bool intel_crtc_has_encoders(struct intel_crtc *crtc)
>
> static struct intel_connector *intel_encoder_find_connector(struct intel_encoder *encoder)
> {
> - struct drm_device *dev = encoder->base.dev;
> + struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> + struct drm_connector_list_iter conn_iter;
> struct intel_connector *connector;
> + struct intel_connector *found_connector = NULL;
>
> - for_each_connector_on_encoder(dev, &encoder->base, connector)
> - return connector;
> + drm_connector_list_iter_begin(&i915->drm, &conn_iter);
> + for_each_intel_connector_iter(connector, &conn_iter) {
> + if (&encoder->base == connector->base.encoder) {
> + found_connector = connector;
> + break;
> + }
> + }
> + drm_connector_list_iter_end(&conn_iter);
>
> - return NULL;
> + return found_connector;
> }
>
> static void intel_sanitize_fifo_underrun_reporting(const struct intel_crtc_state *crtc_state)
--
Jani Nikula, Intel Open Source Graphics Center
