From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> To: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>, Ulrich Hecht <uli+renesas@fpond.eu>, Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Subject: [PATCH v4 07/10] drm: rcar-du: Provide for_each_group helper Date: Thu, 14 Jan 2021 16:22:52 +0000 [thread overview] Message-ID: <20210114162255.705868-8-kieran.bingham+renesas@ideasonboard.com> (raw) In-Reply-To: <20210114162255.705868-1-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. Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu> 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 02ca2d0e1b55..e792ba7f5145 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h @@ -104,6 +104,11 @@ static inline struct rcar_du_device *to_rcar_du_device(struct drm_device *dev) return container_of(dev, struct rcar_du_device, ddev); } +#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 3c10c329c81c..732aac342dab 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c @@ -771,9 +771,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; @@ -820,11 +820,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; @@ -866,8 +862,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.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> To: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>, Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>, Ulrich Hecht <uli+renesas@fpond.eu> Subject: [PATCH v4 07/10] drm: rcar-du: Provide for_each_group helper Date: Thu, 14 Jan 2021 16:22:52 +0000 [thread overview] Message-ID: <20210114162255.705868-8-kieran.bingham+renesas@ideasonboard.com> (raw) In-Reply-To: <20210114162255.705868-1-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. Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu> 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 02ca2d0e1b55..e792ba7f5145 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h @@ -104,6 +104,11 @@ static inline struct rcar_du_device *to_rcar_du_device(struct drm_device *dev) return container_of(dev, struct rcar_du_device, ddev); } +#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 3c10c329c81c..732aac342dab 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c @@ -771,9 +771,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; @@ -820,11 +820,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; @@ -866,8 +862,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.25.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-01-14 16:25 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-14 16:22 [PATCH v4 00/10] drm: rcar-du: Rework CRTC and groups for atomic commits Kieran Bingham 2021-01-14 16:22 ` Kieran Bingham 2021-01-14 16:22 ` [PATCH v4 01/10] media: vsp1: drm: Split vsp1_du_setup_lif() Kieran Bingham 2021-01-14 16:22 ` Kieran Bingham 2021-01-14 16:22 ` [PATCH v4 02/10] media: vsp1: drm: Don't configure hardware when the pipeline is disabled Kieran Bingham 2021-01-14 16:22 ` Kieran Bingham 2021-01-14 16:22 ` [PATCH v4 03/10] drm: rcar-du: Convert to the new VSP atomic API Kieran Bingham 2021-01-14 16:22 ` Kieran Bingham 2021-01-15 13:29 ` kernel test robot 2021-01-16 0:47 ` kernel test robot 2021-01-14 16:22 ` [PATCH v4 04/10] media: vsp1: drm: Remove vsp1_du_setup_lif() Kieran Bingham 2021-01-14 16:22 ` Kieran Bingham 2021-01-14 16:22 ` [PATCH v4 05/10] drm: rcar-du: Handle CRTC standby from commit tail handler Kieran Bingham 2021-01-14 16:22 ` Kieran Bingham 2021-01-14 16:22 ` [PATCH v4 06/10] drm: rcar-du: Handle CRTC configuration " Kieran Bingham 2021-01-14 16:22 ` Kieran Bingham 2021-01-14 16:22 ` Kieran Bingham [this message] 2021-01-14 16:22 ` [PATCH v4 07/10] drm: rcar-du: Provide for_each_group helper Kieran Bingham 2021-01-14 16:22 ` [PATCH v4 08/10] drm: rcar-du: Create a group state object Kieran Bingham 2021-01-14 16:22 ` Kieran Bingham 2021-01-14 16:22 ` [PATCH v4 09/10] drm: rcar-du: Perform group setup from the atomic tail handler Kieran Bingham 2021-01-14 16:22 ` Kieran Bingham 2021-01-14 16:22 ` [PATCH v4 10/10] drm: rcar-du: Centralise routing configuration in commit " Kieran Bingham 2021-01-14 16:22 ` Kieran Bingham
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210114162255.705868-8-kieran.bingham+renesas@ideasonboard.com \ --to=kieran.bingham+renesas@ideasonboard.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=laurent.pinchart+renesas@ideasonboard.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-media@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=uli+renesas@fpond.eu \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.