From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
To: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>,
dri-devel@lists.freedesktop.org
Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH v2 14/14] drm: rcar-du: Configure DPAD0 routing through last group on Gen3
Date: Tue, 1 Aug 2017 14:46:13 +0100 [thread overview]
Message-ID: <ec0cd98e-f74c-fb75-ddaa-2a1a3a8193c8@ideasonboard.com> (raw)
In-Reply-To: <20170626181226.29575-15-laurent.pinchart+renesas@ideasonboard.com>
Hi Laurent,
Thankyou for the patch,
On 26/06/17 19:12, Laurent Pinchart wrote:
> On Gen3 SoCs DPAD0 routing is configured through the last CRTC group,
> unlike on Gen2 where it is configured through the first CRTC group. Fix
> the driver accordingly.
>
> Fixes: 2427b3037710 ("drm: rcar-du: Add R8A7795 device support")
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
> drivers/gpu/drm/rcar-du/rcar_du_group.c | 21 ++++++++++++++-------
> 1 file changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.c b/drivers/gpu/drm/rcar-du/rcar_du_group.c
> index 64738fca96d0..2abb2fdd143e 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_du_group.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_group.c
> @@ -208,23 +208,30 @@ void rcar_du_group_restart(struct rcar_du_group *rgrp)
>
> int rcar_du_set_dpad0_vsp1_routing(struct rcar_du_device *rcdu)
> {
> + struct rcar_du_group *rgrp;
> + struct rcar_du_crtc *crtc;
> int ret;
>
> if (!rcar_du_has(rcdu, RCAR_DU_FEATURE_EXT_CTRL_REGS))
> return 0;
>
> - /* RGB output routing to DPAD0 and VSP1D routing to DU0/1/2 are
> - * configured in the DEFR8 register of the first group. As this function
> - * can be called with the DU0 and DU1 CRTCs disabled, we need to enable
> - * the first group clock before accessing the register.
> + /*
> + * RGB output routing to DPAD0 and VSP1D routing to DU0/1/2 are
> + * configured in the DEFR8 register of the first group on Gen2 and the
> + * last group on Gen3. As this function can be called with the DU
> + * channels of the corresponding CRTCs disabled, we need to enable the
> + * group clock before accessing the register.
> */
> - ret = clk_prepare_enable(rcdu->crtcs[0].clock);
> + rgrp = &rcdu->groups[DIV_ROUND_UP(rcdu->num_crtcs, 2) - 1];
> + crtc = &rcdu->crtcs[rgrp->index * 2];
I'm not certain I understand how this makes a distinct difference between G2,
and G3.
Is rcdu->num_crtcs the distinguishing factor between the SoC's?
> +
> + ret = clk_prepare_enable(crtc->clock);
> if (ret < 0)
> return ret;
>
> - rcar_du_group_setup_defr8(&rcdu->groups[0]);
> + rcar_du_group_setup_defr8(rgrp);
>
> - clk_disable_unprepare(rcdu->crtcs[0].clock);
> + clk_disable_unprepare(crtc->clock);
>
> return 0;
> }
>
next prev parent reply other threads:[~2017-08-01 13:46 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-26 18:12 [PATCH v2 00/14] Renesas R-Car VSP: Add H3 ES2.0 support Laurent Pinchart
2017-06-26 18:12 ` [PATCH v2 01/14] v4l: vsp1: Fill display list headers without holding dlm spinlock Laurent Pinchart
2017-07-13 12:48 ` Kieran Bingham
2017-07-20 13:50 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 02/14] v4l: vsp1: Don't recycle active list at display start Laurent Pinchart
2017-07-13 17:02 ` Kieran Bingham
2017-07-20 13:51 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 03/14] v4l: vsp1: Don't set WPF sink pointer Laurent Pinchart
2017-07-13 12:50 ` Kieran Bingham
2017-07-20 13:52 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 04/14] v4l: vsp1: Store source and sink pointers as vsp1_entity Laurent Pinchart
2017-07-13 13:00 ` Kieran Bingham
2017-07-20 13:53 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 05/14] v4l: vsp1: Don't create links for DRM pipeline Laurent Pinchart
2017-07-13 13:06 ` Kieran Bingham
2017-07-20 13:54 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 06/14] v4l: vsp1: Add pipe index argument to the VSP-DU API Laurent Pinchart
2017-07-13 13:16 ` Kieran Bingham
2017-07-13 23:04 ` Laurent Pinchart
2017-07-20 13:56 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 07/14] v4l: vsp1: Add support for the BRS entity Laurent Pinchart
2017-07-13 13:38 ` Kieran Bingham
2017-07-20 13:58 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 08/14] v4l: vsp1: Add support for new VSP2-BS, VSP2-DL and VSP2-D instances Laurent Pinchart
2017-07-13 17:49 ` Kieran Bingham
2017-07-13 23:31 ` Laurent Pinchart
2017-07-14 7:36 ` Kieran Bingham
2017-07-14 0:35 ` [PATCH v2.1 " Laurent Pinchart
2017-07-20 13:59 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 09/14] v4l: vsp1: Add support for multiple LIF instances Laurent Pinchart
2017-07-13 17:57 ` Kieran Bingham
2017-07-20 14:00 ` Mauro Carvalho Chehab
2017-06-26 18:12 ` [PATCH v2 10/14] v4l: vsp1: Add support for multiple DRM pipelines Laurent Pinchart
2017-07-20 14:02 ` Mauro Carvalho Chehab
2017-08-01 18:39 ` Kieran Bingham
2017-06-26 18:12 ` [PATCH v2 11/14] v4l: vsp1: Add support for header display lists in continuous mode Laurent Pinchart
2017-07-20 14:03 ` Mauro Carvalho Chehab
2017-08-01 17:35 ` Kieran Bingham
2017-08-01 18:47 ` Laurent Pinchart
2017-08-02 11:06 ` Kieran Bingham
2017-06-26 18:12 ` [PATCH v2 12/14] drm: rcar-du: Support multiple sources from the same VSP Laurent Pinchart
2017-08-01 18:10 ` Kieran Bingham
2017-08-01 19:01 ` Laurent Pinchart
2017-06-26 18:12 ` [PATCH v2 13/14] drm: rcar-du: Restrict DPLL duty cycle workaround to H3 ES1.x Laurent Pinchart
2017-08-01 14:06 ` Kieran Bingham
2017-08-01 18:39 ` Laurent Pinchart
2017-12-11 20:58 ` Laurent Pinchart
2017-06-26 18:12 ` [PATCH v2 14/14] drm: rcar-du: Configure DPAD0 routing through last group on Gen3 Laurent Pinchart
2017-08-01 13:46 ` Kieran Bingham [this message]
2017-08-01 13:51 ` Laurent Pinchart
2017-08-01 17:20 ` [PATCH v2.1 " Laurent Pinchart
2017-08-01 17:23 ` Kieran Bingham
2017-07-13 12:25 ` [PATCH v2 00/14] Renesas R-Car VSP: Add H3 ES2.0 support Kieran Bingham
2017-07-14 0:54 ` Laurent Pinchart
2017-07-18 13:03 ` Hans Verkuil
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=ec0cd98e-f74c-fb75-ddaa-2a1a3a8193c8@ideasonboard.com \
--to=kieran.bingham+renesas@ideasonboard.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kieran.bingham@ideasonboard.com \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).