| Message ID | 20190617210930.6054-8-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: rcar-du: Rework CRTC and groups for atomic commits | expand |
Hi Laurent, On 17/06/2019 22:09, Laurent Pinchart wrote: > From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > > 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+renesas@ideasonboard.com> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > Changes since v2: > > - Don't assign __group in the condition part of the for statement of the > for_each_rcdu_group() macro Nice!. > --- > 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..0cc0984bf2ea 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[0]; \ > + (__i) < DIV_ROUND_UP((__rcdu)->num_crtcs, 2); \ > + __i++, __group++) Aha - studying the difference here, I do like this better. -- KB. > + > 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 144c0c1b1591..c04136674e58 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c > @@ -627,9 +627,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; > @@ -670,11 +670,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; > @@ -711,8 +707,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; >
> On June 17, 2019 at 11:09 PM Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> wrote: > > > From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > > 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+renesas@ideasonboard.com> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > Changes since v2: > > - Don't assign __group in the condition part of the for statement of the > for_each_rcdu_group() macro > --- > 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..0cc0984bf2ea 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[0]; \ > + (__i) < DIV_ROUND_UP((__rcdu)->num_crtcs, 2); \ > + __i++, __group++) > + > 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 144c0c1b1591..c04136674e58 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c > @@ -627,9 +627,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; > @@ -670,11 +670,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; > @@ -711,8 +707,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; > -- > Regards, > > Laurent Pinchart > Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu> CU Uli
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index 1327cd0df90a..0cc0984bf2ea 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[0]; \ + (__i) < DIV_ROUND_UP((__rcdu)->num_crtcs, 2); \ + __i++, __group++) + 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 144c0c1b1591..c04136674e58 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c @@ -627,9 +627,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; @@ -670,11 +670,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; @@ -711,8 +707,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;