[PATCH v2 5/9] drm/nouveau: Use drm_connector_for_each_possible_encoder()

[Ville Syrjala]

From: Ville Syrjälä <ville.syrj...@linux.intel.com>

Use drm_connector_for_each_possible_encoder() for iterating
connector->encoder_ids[]. A bit more convenient not having
to deal with the implementation details.

v2: Replace drm_for_each_connector_encoder_ids() with
    drm_connector_for_each_possible_encoder() (Daniel)

Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
Cc: Ben Skeggs <bske...@redhat.com>
Cc: nouv...@lists.freedesktop.org
Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> #v1
---
 drivers/gpu/drm/nouveau/nouveau_connector.c | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c 
b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 7b557c354307..28d7b42cd666 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -363,19 +363,11 @@ module_param_named(hdmimhz, nouveau_hdmimhz, int, 0400);
 struct nouveau_encoder *
 find_encoder(struct drm_connector *connector, int type)
 {
-       struct drm_device *dev = connector->dev;
        struct nouveau_encoder *nv_encoder;
        struct drm_encoder *enc;
-       int i, id;
-
-       for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
-               id = connector->encoder_ids[i];
-               if (!id)
-                       break;
+       int i;
 
-               enc = drm_encoder_find(dev, NULL, id);
-               if (!enc)
-                       continue;
+       drm_connector_for_each_possible_encoder(connector, enc, i) {
                nv_encoder = nouveau_encoder(enc);
 
                if (type == DCB_OUTPUT_ANY ||
@@ -436,14 +428,7 @@ nouveau_connector_ddc_detect(struct drm_connector 
*connector)
                }
        }
 
-       for (i = 0; nv_encoder = NULL, i < DRM_CONNECTOR_MAX_ENCODER; i++) {
-               int id = connector->encoder_ids[i];
-               if (id == 0)
-                       break;
-
-               encoder = drm_encoder_find(dev, NULL, id);
-               if (!encoder)
-                       continue;
+       drm_connector_for_each_possible_encoder(connector, encoder, i) {
                nv_encoder = nouveau_encoder(encoder);
 
                if (nv_encoder->dcb->type == DCB_OUTPUT_DP) {
-- 
2.16.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel