From: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com> To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>, dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org Cc: Geert Uytterhoeven <geert@linux-m68k.org>, Koji Matsuoka <koji.matsuoka.xm@renesas.com>, LUU HOAI <hoai.luu.ub@renesas.com>, Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com> Subject: [PATCH v3 4/7] drm: rcar-du: lvds: Fix stop sequence Date: Mon, 23 Jan 2023 12:47:39 +0200 [thread overview] Message-ID: <20230123104742.227460-5-tomi.valkeinen+renesas@ideasonboard.com> (raw) In-Reply-To: <20230123104742.227460-1-tomi.valkeinen+renesas@ideasonboard.com> From: Koji Matsuoka <koji.matsuoka.xm@renesas.com> According to hardware manual, LVDCR0 register must be cleared bit by bit when disabling LVDS. Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com> Signed-off-by: LUU HOAI <hoai.luu.ub@renesas.com> [tomi.valkeinen: simplified the code a bit] Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/gpu/drm/rcar-du/rcar_lvds.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c index a11201e4d31b..8cd86a3d65a5 100644 --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c @@ -83,6 +83,11 @@ struct rcar_lvds { #define bridge_to_rcar_lvds(b) \ container_of(b, struct rcar_lvds, bridge) +static u32 rcar_lvds_read(struct rcar_lvds *lvds, u32 reg) +{ + return ioread32(lvds->mmio + reg); +} + static void rcar_lvds_write(struct rcar_lvds *lvds, u32 reg, u32 data) { iowrite32(data, lvds->mmio + reg); @@ -544,6 +549,27 @@ static void rcar_lvds_atomic_disable(struct drm_bridge *bridge, struct drm_bridge_state *old_bridge_state) { struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge); + u32 lvdcr0; + + lvdcr0 = rcar_lvds_read(lvds, LVDCR0); + + lvdcr0 &= ~LVDCR0_LVRES; + rcar_lvds_write(lvds, LVDCR0, lvdcr0); + + if (lvds->info->quirks & RCAR_LVDS_QUIRK_GEN3_LVEN) { + lvdcr0 &= ~LVDCR0_LVEN; + rcar_lvds_write(lvds, LVDCR0, lvdcr0); + } + + if (lvds->info->quirks & RCAR_LVDS_QUIRK_PWD) { + lvdcr0 &= ~LVDCR0_PWD; + rcar_lvds_write(lvds, LVDCR0, lvdcr0); + } + + if (!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)) { + lvdcr0 &= ~LVDCR0_PLLON; + rcar_lvds_write(lvds, LVDCR0, lvdcr0); + } rcar_lvds_write(lvds, LVDCR0, 0); rcar_lvds_write(lvds, LVDCR1, 0); -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com> To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>, dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org Cc: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>, Geert Uytterhoeven <geert@linux-m68k.org>, Koji Matsuoka <koji.matsuoka.xm@renesas.com>, LUU HOAI <hoai.luu.ub@renesas.com> Subject: [PATCH v3 4/7] drm: rcar-du: lvds: Fix stop sequence Date: Mon, 23 Jan 2023 12:47:39 +0200 [thread overview] Message-ID: <20230123104742.227460-5-tomi.valkeinen+renesas@ideasonboard.com> (raw) In-Reply-To: <20230123104742.227460-1-tomi.valkeinen+renesas@ideasonboard.com> From: Koji Matsuoka <koji.matsuoka.xm@renesas.com> According to hardware manual, LVDCR0 register must be cleared bit by bit when disabling LVDS. Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com> Signed-off-by: LUU HOAI <hoai.luu.ub@renesas.com> [tomi.valkeinen: simplified the code a bit] Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/gpu/drm/rcar-du/rcar_lvds.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c index a11201e4d31b..8cd86a3d65a5 100644 --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c @@ -83,6 +83,11 @@ struct rcar_lvds { #define bridge_to_rcar_lvds(b) \ container_of(b, struct rcar_lvds, bridge) +static u32 rcar_lvds_read(struct rcar_lvds *lvds, u32 reg) +{ + return ioread32(lvds->mmio + reg); +} + static void rcar_lvds_write(struct rcar_lvds *lvds, u32 reg, u32 data) { iowrite32(data, lvds->mmio + reg); @@ -544,6 +549,27 @@ static void rcar_lvds_atomic_disable(struct drm_bridge *bridge, struct drm_bridge_state *old_bridge_state) { struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge); + u32 lvdcr0; + + lvdcr0 = rcar_lvds_read(lvds, LVDCR0); + + lvdcr0 &= ~LVDCR0_LVRES; + rcar_lvds_write(lvds, LVDCR0, lvdcr0); + + if (lvds->info->quirks & RCAR_LVDS_QUIRK_GEN3_LVEN) { + lvdcr0 &= ~LVDCR0_LVEN; + rcar_lvds_write(lvds, LVDCR0, lvdcr0); + } + + if (lvds->info->quirks & RCAR_LVDS_QUIRK_PWD) { + lvdcr0 &= ~LVDCR0_PWD; + rcar_lvds_write(lvds, LVDCR0, lvdcr0); + } + + if (!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)) { + lvdcr0 &= ~LVDCR0_PLLON; + rcar_lvds_write(lvds, LVDCR0, lvdcr0); + } rcar_lvds_write(lvds, LVDCR0, 0); rcar_lvds_write(lvds, LVDCR1, 0); -- 2.34.1
next prev parent reply other threads:[~2023-01-23 10:48 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-01-23 10:47 [PATCH v3 0/7] drm: rcar-du: Misc patches Tomi Valkeinen 2023-01-23 10:47 ` Tomi Valkeinen 2023-01-23 10:47 ` [PATCH v3 1/7] drm: rcar-du: dsi: add 'select RESET_CONTROLLER' Tomi Valkeinen 2023-01-23 10:47 ` Tomi Valkeinen 2023-01-23 10:47 ` [PATCH v3 2/7] drm: rcar-du: lvds: Add runtime PM Tomi Valkeinen 2023-01-23 10:47 ` Tomi Valkeinen 2023-01-23 10:47 ` [PATCH v3 3/7] drm: rcar-du: lvds: Add reset control Tomi Valkeinen 2023-01-23 10:47 ` Tomi Valkeinen 2023-01-23 10:47 ` Tomi Valkeinen [this message] 2023-01-23 10:47 ` [PATCH v3 4/7] drm: rcar-du: lvds: Fix stop sequence Tomi Valkeinen 2023-01-23 14:28 ` Geert Uytterhoeven 2023-01-23 14:28 ` Geert Uytterhoeven 2023-01-23 22:36 ` Laurent Pinchart 2023-01-23 22:36 ` Laurent Pinchart 2023-01-23 22:50 ` [PATCH v3.1 " Laurent Pinchart 2023-01-23 22:50 ` Laurent Pinchart 2023-01-23 10:47 ` [PATCH v3 5/7] drm: rcar-du: Add quirk for H3 ES1.x pclk workaround Tomi Valkeinen 2023-01-23 10:47 ` Tomi Valkeinen 2023-01-23 10:47 ` [PATCH v3 6/7] drm: rcar-du: Fix setting a reserved bit in DPLLCR Tomi Valkeinen 2023-01-23 10:47 ` Tomi Valkeinen 2023-01-23 10:47 ` [PATCH v3 7/7] drm: rcar-du: Stop accessing non-existant registers on gen4 Tomi Valkeinen 2023-01-23 10:47 ` Tomi Valkeinen
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=20230123104742.227460-5-tomi.valkeinen+renesas@ideasonboard.com \ --to=tomi.valkeinen+renesas@ideasonboard.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=geert@linux-m68k.org \ --cc=hoai.luu.ub@renesas.com \ --cc=kieran.bingham+renesas@ideasonboard.com \ --cc=koji.matsuoka.xm@renesas.com \ --cc=laurent.pinchart@ideasonboard.com \ --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: 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.