Refactoring of the group control code will soon require more iteration
over the available groups. Simplify this process by introducing a group
iteration helper.

Signed-off-by: Kieran Bingham <kieran.bingham+rene...@ideasonboard.com>
---
v2:
 - no change

 drivers/gpu/drm/rcar-du/rcar_du_drv.h |  5 +++++
 drivers/gpu/drm/rcar-du/rcar_du_kms.c | 10 ++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h 
b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
index 1327cd0df90a..1e9dd494e8ac 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
@@ -96,6 +96,11 @@ struct rcar_du_device {
        unsigned int vspd1_sink;
 };
 
+#define for_each_rcdu_group(__rcdu, __group, __i) \
+       for ((__i) = 0; (__group = &(rcdu)->groups[__i]), \
+            (__i) < DIV_ROUND_UP((rcdu)->num_crtcs, 2); \
+            __i++)
+
 static inline bool rcar_du_has(struct rcar_du_device *rcdu,
                               unsigned int feature)
 {
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c 
b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index e4befb1937f8..ece92cff2137 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -522,9 +522,9 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
 
        struct drm_device *dev = rcdu->ddev;
        struct drm_encoder *encoder;
+       struct rcar_du_group *rgrp;
        unsigned int dpad0_sources;
        unsigned int num_encoders;
-       unsigned int num_groups;
        unsigned int swindex;
        unsigned int hwindex;
        unsigned int i;
@@ -565,11 +565,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
                return ret;
 
        /* Initialize the groups. */
-       num_groups = DIV_ROUND_UP(rcdu->num_crtcs, 2);
-
-       for (i = 0; i < num_groups; ++i) {
-               struct rcar_du_group *rgrp = &rcdu->groups[i];
-
+       for_each_rcdu_group(rcdu, rgrp, i) {
                mutex_init(&rgrp->lock);
 
                rgrp->dev = rcdu;
@@ -606,8 +602,6 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
 
        /* Create the CRTCs. */
        for (swindex = 0, hwindex = 0; swindex < rcdu->num_crtcs; ++hwindex) {
-               struct rcar_du_group *rgrp;
-
                /* Skip unpopulated DU channels. */
                if (!(rcdu->info->channels_mask & BIT(hwindex)))
                        continue;
-- 
2.19.1

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

Reply via email to