From: Ville Syrjälä Date: Wed, 9 Jun 2021 08:56:27 +0000 (+0300) Subject: drm/i915: Stop hand rolling drm_crtc_mask() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f07d7400ecf56650f6a70313d10392cccb6e62a3;p=linux.git drm/i915: Stop hand rolling drm_crtc_mask() Use drm_crtc_mask() instead of hand rolling it. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20210609085632.22026-2-ville.syrjala@linux.intel.com Reviewed-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index db42421867c82..543ea8b3cf17f 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -6485,7 +6485,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector, struct drm_atomic_state *state = NULL, *restore_state = NULL; struct drm_connector_state *connector_state; struct intel_crtc_state *crtc_state; - int ret, i = -1; + int ret; drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s], [ENCODER:%d:%s]\n", connector->base.id, connector->name, @@ -6519,8 +6519,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector, /* Find an unused one (if possible) */ for_each_crtc(dev, possible_crtc) { - i++; - if (!(encoder->possible_crtcs & (1 << i))) + if (!(encoder->possible_crtcs & drm_crtc_mask(possible_crtc))) continue; ret = drm_modeset_lock(&possible_crtc->mutex, ctx);