From: Jacopo Mondi <jacopo+renesas@jmondi.org> To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, David Airlie <airlied@linux.ie> Cc: Jacopo Mondi <jacopo+renesas@jmondi.org>, ulrich.hecht+renesas@gmail.com, kieran.bingham@ideasonboard.com, dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR RENESAS), linux-renesas-soc@vger.kernel.org (open list:DRM DRIVERS FOR RENESAS) Subject: [PATCH 4/4] drm: rcar-du: Fix handling of PnMR register Date: Thu, 23 Aug 2018 17:12:14 +0200 [thread overview] Message-ID: <1535037134-373-5-git-send-email-jacopo+renesas@jmondi.org> (raw) In-Reply-To: <1535037134-373-1-git-send-email-jacopo+renesas@jmondi.org> According to revision 1.00 of R-Car Gen3 Soc manual, setting bits PnMR[13:12] is only valid if the DU group has two channels. It is then valid writing to PnMR[13:12] for: R-Car H3 = DU group 0 and DU group 1 R-Car M3-W, M3-N: DU group 0 only R-Car D3/E3: DU group 0 (no group 1) It is always invalid writing PnMR[13:12] on: R-Car V3M/V3H: only group 0 is present, but with a single channel Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org> --- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c index 5c2462a..647d2fc 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c @@ -505,8 +505,17 @@ static void rcar_du_plane_setup_format_gen3(struct rcar_du_group *rgrp, unsigned int index, const struct rcar_du_plane_state *state) { - rcar_du_plane_write(rgrp, index, PnMR, - PnMR_SPIM_TP_OFF | state->format->pnmr); + u32 mask = BIT(rgrp->index * 2) | BIT(rgrp->index * 2 + 1); + u32 pnmr = PnMR_SPIM_TP_OFF; + + /* + * Setting PnMR[13:12] is only allowed when more than 1 channel is + * availble in the group. + */ + if ((rgrp->channels_mask & mask) == mask) + pnmr |= state->format->pnmr; + + rcar_du_plane_write(rgrp, index, PnMR, pnmr); rcar_du_plane_write(rgrp, index, PnDDCR4, state->format->edf | PnDDCR4_CODE); -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Jacopo Mondi <jacopo+renesas@jmondi.org> To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, David Airlie <airlied@linux.ie> Cc: ulrich.hecht+renesas@gmail.com, "open list:DRM DRIVERS FOR RENESAS" <linux-renesas-soc@vger.kernel.org>, Jacopo Mondi <jacopo+renesas@jmondi.org>, kieran.bingham@ideasonboard.com, "open list:DRM DRIVERS FOR RENESAS" <dri-devel@lists.freedesktop.org> Subject: [PATCH 4/4] drm: rcar-du: Fix handling of PnMR register Date: Thu, 23 Aug 2018 17:12:14 +0200 [thread overview] Message-ID: <1535037134-373-5-git-send-email-jacopo+renesas@jmondi.org> (raw) In-Reply-To: <1535037134-373-1-git-send-email-jacopo+renesas@jmondi.org> According to revision 1.00 of R-Car Gen3 Soc manual, setting bits PnMR[13:12] is only valid if the DU group has two channels. It is then valid writing to PnMR[13:12] for: R-Car H3 = DU group 0 and DU group 1 R-Car M3-W, M3-N: DU group 0 only R-Car D3/E3: DU group 0 (no group 1) It is always invalid writing PnMR[13:12] on: R-Car V3M/V3H: only group 0 is present, but with a single channel Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org> --- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c index 5c2462a..647d2fc 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c @@ -505,8 +505,17 @@ static void rcar_du_plane_setup_format_gen3(struct rcar_du_group *rgrp, unsigned int index, const struct rcar_du_plane_state *state) { - rcar_du_plane_write(rgrp, index, PnMR, - PnMR_SPIM_TP_OFF | state->format->pnmr); + u32 mask = BIT(rgrp->index * 2) | BIT(rgrp->index * 2 + 1); + u32 pnmr = PnMR_SPIM_TP_OFF; + + /* + * Setting PnMR[13:12] is only allowed when more than 1 channel is + * availble in the group. + */ + if ((rgrp->channels_mask & mask) == mask) + pnmr |= state->format->pnmr; + + rcar_du_plane_write(rgrp, index, PnMR, pnmr); rcar_du_plane_write(rgrp, index, PnDDCR4, state->format->edf | PnDDCR4_CODE); -- 2.7.4 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-08-23 18:42 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-08-23 15:12 [PATCH 0/4] drm: rcar-du: Update to SoC manual revision 1.00 Jacopo Mondi 2018-08-23 15:12 ` Jacopo Mondi 2018-08-23 15:12 ` [PATCH 1/4] drm: rcar-du: Do not write ESCR for DPLL channels Jacopo Mondi 2018-08-23 15:12 ` Jacopo Mondi 2018-08-23 15:12 ` [PATCH 2/4] drm: rcar-du: Write OTAR for DPAD channels only Jacopo Mondi 2018-08-23 15:12 ` Jacopo Mondi 2018-08-23 15:12 ` [PATCH 3/4] drm: rcar-du: Fix handling of DORCR for group 1 Jacopo Mondi 2018-08-23 15:12 ` Jacopo Mondi 2018-08-23 15:12 ` Jacopo Mondi [this message] 2018-08-23 15:12 ` [PATCH 4/4] drm: rcar-du: Fix handling of PnMR register Jacopo Mondi 2018-09-14 13:58 ` [PATCH 0/4] drm: rcar-du: Update to SoC manual revision 1.00 jacopo mondi 2018-09-14 13:58 ` jacopo mondi
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=1535037134-373-5-git-send-email-jacopo+renesas@jmondi.org \ --to=jacopo+renesas@jmondi.org \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=kieran.bingham@ideasonboard.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=ulrich.hecht+renesas@gmail.com \ /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.