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>, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Subject: [PATCH v3 0/7] drm: rcar-du: Misc patches Date: Mon, 23 Jan 2023 12:47:35 +0200 [thread overview] Message-ID: <20230123104742.227460-1-tomi.valkeinen+renesas@ideasonboard.com> (raw) From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Hi, Diff to v2: - Depend on PM in Kconfig to ensure runtime PM works - Fix access to DEFR7 in "drm: rcar-du: Stop accessing non-existant registers on gen4" - Use pm_runtime_put_sync() instead of pm_runtime_put() - Add missing line feed - Fix lvsd typo in commit message Tomi Koji Matsuoka (1): drm: rcar-du: lvds: Fix stop sequence Tomi Valkeinen (6): drm: rcar-du: dsi: add 'select RESET_CONTROLLER' drm: rcar-du: lvds: Add runtime PM drm: rcar-du: lvds: Add reset control drm: rcar-du: Add quirk for H3 ES1.x pclk workaround drm: rcar-du: Fix setting a reserved bit in DPLLCR drm: rcar-du: Stop accessing non-existant registers on gen4 drivers/gpu/drm/rcar-du/Kconfig | 3 + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 39 +++++++---- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 49 ++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_drv.h | 2 + drivers/gpu/drm/rcar-du/rcar_du_group.c | 24 ++++--- drivers/gpu/drm/rcar-du/rcar_du_regs.h | 8 +-- drivers/gpu/drm/rcar-du/rcar_lvds.c | 87 +++++++++++++++++++++++-- 7 files changed, 177 insertions(+), 35 deletions(-) Interdiff against v2: diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig index 151e400b996d..742f6f2c8de8 100644 --- a/drivers/gpu/drm/rcar-du/Kconfig +++ b/drivers/gpu/drm/rcar-du/Kconfig @@ -39,6 +39,7 @@ config DRM_RCAR_USE_LVDS config DRM_RCAR_LVDS def_tristate DRM_RCAR_DU depends on DRM_RCAR_USE_LVDS + depends on PM select DRM_KMS_HELPER select DRM_PANEL select OF_FLATTREE diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.c b/drivers/gpu/drm/rcar-du/rcar_du_group.c index c2209d427bb7..152602236377 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_group.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_group.c @@ -151,14 +151,16 @@ static void rcar_du_group_setup(struct rcar_du_group *rgrp) if (rcdu->info->gen < 4) rcar_du_group_setup_pins(rgrp); - /* - * TODO: Handle routing of the DU output to CMM dynamically, as we - * should bypass CMM completely when no color management feature is - * used. - */ - defr7 |= (rgrp->cmms_mask & BIT(1) ? DEFR7_CMME1 : 0) | - (rgrp->cmms_mask & BIT(0) ? DEFR7_CMME0 : 0); - rcar_du_group_write(rgrp, DEFR7, defr7); + if (rcdu->info->gen < 4) { + /* + * TODO: Handle routing of the DU output to CMM dynamically, as + * we should bypass CMM completely when no color management + * feature is used. + */ + defr7 |= (rgrp->cmms_mask & BIT(1) ? DEFR7_CMME1 : 0) | + (rgrp->cmms_mask & BIT(0) ? DEFR7_CMME0 : 0); + rcar_du_group_write(rgrp, DEFR7, defr7); + } if (rcdu->info->gen >= 2) { if (rcdu->info->gen < 4) @@ -194,13 +196,10 @@ static void rcar_du_group_setup(struct rcar_du_group *rgrp) */ int rcar_du_group_get(struct rcar_du_group *rgrp) { - struct rcar_du_device *rcdu = rgrp->dev; - if (rgrp->use_count) goto done; - if (rcdu->info->gen < 4) - rcar_du_group_setup(rgrp); + rcar_du_group_setup(rgrp); done: rgrp->use_count++; diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c index 8fa5f7400179..8cd86a3d65a5 100644 --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c @@ -345,7 +345,7 @@ void rcar_lvds_pclk_disable(struct drm_bridge *bridge) rcar_lvds_write(lvds, LVDPLLCR, 0); - pm_runtime_put(lvds->dev); + pm_runtime_put_sync(lvds->dev); } EXPORT_SYMBOL_GPL(rcar_lvds_pclk_disable); @@ -580,7 +580,7 @@ static void rcar_lvds_atomic_disable(struct drm_bridge *bridge, lvds->companion->funcs->atomic_disable(lvds->companion, old_bridge_state); - pm_runtime_put(lvds->dev); + pm_runtime_put_sync(lvds->dev); } static bool rcar_lvds_mode_fixup(struct drm_bridge *bridge, @@ -877,6 +877,7 @@ static int rcar_lvds_probe(struct platform_device *pdev) if (IS_ERR(lvds->rstc)) return dev_err_probe(&pdev->dev, PTR_ERR(lvds->rstc), "failed to get cpg reset\n"); + pm_runtime_enable(&pdev->dev); drm_bridge_add(&lvds->bridge); -- 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@ideasonboard.com>, Geert Uytterhoeven <geert@linux-m68k.org> Subject: [PATCH v3 0/7] drm: rcar-du: Misc patches Date: Mon, 23 Jan 2023 12:47:35 +0200 [thread overview] Message-ID: <20230123104742.227460-1-tomi.valkeinen+renesas@ideasonboard.com> (raw) From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Hi, Diff to v2: - Depend on PM in Kconfig to ensure runtime PM works - Fix access to DEFR7 in "drm: rcar-du: Stop accessing non-existant registers on gen4" - Use pm_runtime_put_sync() instead of pm_runtime_put() - Add missing line feed - Fix lvsd typo in commit message Tomi Koji Matsuoka (1): drm: rcar-du: lvds: Fix stop sequence Tomi Valkeinen (6): drm: rcar-du: dsi: add 'select RESET_CONTROLLER' drm: rcar-du: lvds: Add runtime PM drm: rcar-du: lvds: Add reset control drm: rcar-du: Add quirk for H3 ES1.x pclk workaround drm: rcar-du: Fix setting a reserved bit in DPLLCR drm: rcar-du: Stop accessing non-existant registers on gen4 drivers/gpu/drm/rcar-du/Kconfig | 3 + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 39 +++++++---- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 49 ++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_drv.h | 2 + drivers/gpu/drm/rcar-du/rcar_du_group.c | 24 ++++--- drivers/gpu/drm/rcar-du/rcar_du_regs.h | 8 +-- drivers/gpu/drm/rcar-du/rcar_lvds.c | 87 +++++++++++++++++++++++-- 7 files changed, 177 insertions(+), 35 deletions(-) Interdiff against v2: diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig index 151e400b996d..742f6f2c8de8 100644 --- a/drivers/gpu/drm/rcar-du/Kconfig +++ b/drivers/gpu/drm/rcar-du/Kconfig @@ -39,6 +39,7 @@ config DRM_RCAR_USE_LVDS config DRM_RCAR_LVDS def_tristate DRM_RCAR_DU depends on DRM_RCAR_USE_LVDS + depends on PM select DRM_KMS_HELPER select DRM_PANEL select OF_FLATTREE diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.c b/drivers/gpu/drm/rcar-du/rcar_du_group.c index c2209d427bb7..152602236377 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_group.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_group.c @@ -151,14 +151,16 @@ static void rcar_du_group_setup(struct rcar_du_group *rgrp) if (rcdu->info->gen < 4) rcar_du_group_setup_pins(rgrp); - /* - * TODO: Handle routing of the DU output to CMM dynamically, as we - * should bypass CMM completely when no color management feature is - * used. - */ - defr7 |= (rgrp->cmms_mask & BIT(1) ? DEFR7_CMME1 : 0) | - (rgrp->cmms_mask & BIT(0) ? DEFR7_CMME0 : 0); - rcar_du_group_write(rgrp, DEFR7, defr7); + if (rcdu->info->gen < 4) { + /* + * TODO: Handle routing of the DU output to CMM dynamically, as + * we should bypass CMM completely when no color management + * feature is used. + */ + defr7 |= (rgrp->cmms_mask & BIT(1) ? DEFR7_CMME1 : 0) | + (rgrp->cmms_mask & BIT(0) ? DEFR7_CMME0 : 0); + rcar_du_group_write(rgrp, DEFR7, defr7); + } if (rcdu->info->gen >= 2) { if (rcdu->info->gen < 4) @@ -194,13 +196,10 @@ static void rcar_du_group_setup(struct rcar_du_group *rgrp) */ int rcar_du_group_get(struct rcar_du_group *rgrp) { - struct rcar_du_device *rcdu = rgrp->dev; - if (rgrp->use_count) goto done; - if (rcdu->info->gen < 4) - rcar_du_group_setup(rgrp); + rcar_du_group_setup(rgrp); done: rgrp->use_count++; diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c index 8fa5f7400179..8cd86a3d65a5 100644 --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c @@ -345,7 +345,7 @@ void rcar_lvds_pclk_disable(struct drm_bridge *bridge) rcar_lvds_write(lvds, LVDPLLCR, 0); - pm_runtime_put(lvds->dev); + pm_runtime_put_sync(lvds->dev); } EXPORT_SYMBOL_GPL(rcar_lvds_pclk_disable); @@ -580,7 +580,7 @@ static void rcar_lvds_atomic_disable(struct drm_bridge *bridge, lvds->companion->funcs->atomic_disable(lvds->companion, old_bridge_state); - pm_runtime_put(lvds->dev); + pm_runtime_put_sync(lvds->dev); } static bool rcar_lvds_mode_fixup(struct drm_bridge *bridge, @@ -877,6 +877,7 @@ static int rcar_lvds_probe(struct platform_device *pdev) if (IS_ERR(lvds->rstc)) return dev_err_probe(&pdev->dev, PTR_ERR(lvds->rstc), "failed to get cpg reset\n"); + pm_runtime_enable(&pdev->dev); drm_bridge_add(&lvds->bridge); -- 2.34.1
next 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 Tomi Valkeinen [this message] 2023-01-23 10:47 ` [PATCH v3 0/7] drm: rcar-du: Misc patches 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 ` [PATCH v3 4/7] drm: rcar-du: lvds: Fix stop sequence Tomi Valkeinen 2023-01-23 10:47 ` 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-1-tomi.valkeinen+renesas@ideasonboard.com \ --to=tomi.valkeinen+renesas@ideasonboard.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=geert@linux-m68k.org \ --cc=kieran.bingham+renesas@ideasonboard.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=tomi.valkeinen@ideasonboard.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.