From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Cc: dri-devel@lists.freedesktop.org,
linux-renesas-soc@vger.kernel.org,
Kieran Bingham <kieran.bingham@ideasonboard.com>
Subject: Re: [PATCH 2/3] drm: rcar-du: lvds: Move LVDS enable code to separate code section
Date: Wed, 15 Feb 2023 10:34:02 +0200 [thread overview]
Message-ID: <Y+yY+ht8nLKX/0iJ@pendragon.ideasonboard.com> (raw)
In-Reply-To: <97145393-8509-b5eb-0c1e-666179f3203f@ideasonboard.com>
On Wed, Feb 15, 2023 at 08:20:51AM +0200, Tomi Valkeinen wrote:
> On 14/02/2023 02:37, Laurent Pinchart wrote:
> > To prepare for a rework of the LVDS disable code, which will need to be
> > called from rcar_lvds_pclk_disable(), move the LVDS enable code,
> > currently stored in the __rcar_lvds_atomic_enable() function, to a
> > separate code section separate from bridge operations. It will be then
> > extended with the LVDS disable code.
> >
> > As part of this rework the __rcar_lvds_atomic_enable() function is
> > renamed to rcar_lvds_enable() to more clearly indicate its purpose.
> >
> > No functional change intended.
>
> The desc is a bit confusing, as it talks about moving LVDS enable code,
> but the diff shows you moving the lvds pclk enable/disable code. Other
> than that:
I moved the enable code, but git showed the diff differently. As the
goal was to move the enable code to later add disable code next to it,
I'll keep the commit message as-is.
> Reviewed-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
>
> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> > drivers/gpu/drm/rcar-du/rcar_lvds.c | 97 +++++++++++++++--------------
> > 1 file changed, 50 insertions(+), 47 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> > index 61de18af62e6..70cdd5ec64d5 100644
> > --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
> > +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> > @@ -311,46 +311,7 @@ static void rcar_lvds_pll_setup_d3_e3(struct rcar_lvds *lvds, unsigned int freq)
> > }
> >
> > /* -----------------------------------------------------------------------------
> > - * Clock - D3/E3 only
> > - */
> > -
> > -int rcar_lvds_pclk_enable(struct drm_bridge *bridge, unsigned long freq)
> > -{
> > - struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
> > - int ret;
> > -
> > - if (WARN_ON(!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)))
> > - return -ENODEV;
> > -
> > - dev_dbg(lvds->dev, "enabling LVDS PLL, freq=%luHz\n", freq);
> > -
> > - ret = pm_runtime_resume_and_get(lvds->dev);
> > - if (ret)
> > - return ret;
> > -
> > - __rcar_lvds_pll_setup_d3_e3(lvds, freq, true);
> > -
> > - return 0;
> > -}
> > -EXPORT_SYMBOL_GPL(rcar_lvds_pclk_enable);
> > -
> > -void rcar_lvds_pclk_disable(struct drm_bridge *bridge)
> > -{
> > - struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
> > -
> > - if (WARN_ON(!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)))
> > - return;
> > -
> > - dev_dbg(lvds->dev, "disabling LVDS PLL\n");
> > -
> > - rcar_lvds_write(lvds, LVDPLLCR, 0);
> > -
> > - pm_runtime_put_sync(lvds->dev);
> > -}
> > -EXPORT_SYMBOL_GPL(rcar_lvds_pclk_disable);
> > -
> > -/* -----------------------------------------------------------------------------
> > - * Bridge
> > + * Enable/disable
> > */
> >
> > static enum rcar_lvds_mode rcar_lvds_get_lvds_mode(struct rcar_lvds *lvds,
> > @@ -394,10 +355,10 @@ static enum rcar_lvds_mode rcar_lvds_get_lvds_mode(struct rcar_lvds *lvds,
> > return mode;
> > }
> >
> > -static void __rcar_lvds_atomic_enable(struct drm_bridge *bridge,
> > - struct drm_atomic_state *state,
> > - struct drm_crtc *crtc,
> > - struct drm_connector *connector)
> > +static void rcar_lvds_enable(struct drm_bridge *bridge,
> > + struct drm_atomic_state *state,
> > + struct drm_crtc *crtc,
> > + struct drm_connector *connector)
> > {
> > struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
> > u32 lvdhcr;
> > @@ -410,8 +371,7 @@ static void __rcar_lvds_atomic_enable(struct drm_bridge *bridge,
> >
> > /* Enable the companion LVDS encoder in dual-link mode. */
> > if (lvds->link_type != RCAR_LVDS_SINGLE_LINK && lvds->companion)
> > - __rcar_lvds_atomic_enable(lvds->companion, state, crtc,
> > - connector);
> > + rcar_lvds_enable(lvds->companion, state, crtc, connector);
> >
> > /*
> > * Hardcode the channels and control signals routing for now.
> > @@ -531,6 +491,49 @@ static void __rcar_lvds_atomic_enable(struct drm_bridge *bridge,
> > rcar_lvds_write(lvds, LVDCR0, lvdcr0);
> > }
> >
> > +/* -----------------------------------------------------------------------------
> > + * Clock - D3/E3 only
> > + */
> > +
> > +int rcar_lvds_pclk_enable(struct drm_bridge *bridge, unsigned long freq)
> > +{
> > + struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
> > + int ret;
> > +
> > + if (WARN_ON(!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)))
> > + return -ENODEV;
> > +
> > + dev_dbg(lvds->dev, "enabling LVDS PLL, freq=%luHz\n", freq);
> > +
> > + ret = pm_runtime_resume_and_get(lvds->dev);
> > + if (ret)
> > + return ret;
> > +
> > + __rcar_lvds_pll_setup_d3_e3(lvds, freq, true);
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(rcar_lvds_pclk_enable);
> > +
> > +void rcar_lvds_pclk_disable(struct drm_bridge *bridge)
> > +{
> > + struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
> > +
> > + if (WARN_ON(!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)))
> > + return;
> > +
> > + dev_dbg(lvds->dev, "disabling LVDS PLL\n");
> > +
> > + rcar_lvds_write(lvds, LVDPLLCR, 0);
> > +
> > + pm_runtime_put_sync(lvds->dev);
> > +}
> > +EXPORT_SYMBOL_GPL(rcar_lvds_pclk_disable);
> > +
> > +/* -----------------------------------------------------------------------------
> > + * Bridge
> > + */
> > +
> > static void rcar_lvds_atomic_enable(struct drm_bridge *bridge,
> > struct drm_bridge_state *old_bridge_state)
> > {
> > @@ -542,7 +545,7 @@ static void rcar_lvds_atomic_enable(struct drm_bridge *bridge,
> > bridge->encoder);
> > crtc = drm_atomic_get_new_connector_state(state, connector)->crtc;
> >
> > - __rcar_lvds_atomic_enable(bridge, state, crtc, connector);
> > + rcar_lvds_enable(bridge, state, crtc, connector);
> > }
> >
> > static void rcar_lvds_atomic_disable(struct drm_bridge *bridge,
>
--
Regards,
Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Cc: linux-renesas-soc@vger.kernel.org,
Kieran Bingham <kieran.bingham@ideasonboard.com>,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 2/3] drm: rcar-du: lvds: Move LVDS enable code to separate code section
Date: Wed, 15 Feb 2023 10:34:02 +0200 [thread overview]
Message-ID: <Y+yY+ht8nLKX/0iJ@pendragon.ideasonboard.com> (raw)
In-Reply-To: <97145393-8509-b5eb-0c1e-666179f3203f@ideasonboard.com>
On Wed, Feb 15, 2023 at 08:20:51AM +0200, Tomi Valkeinen wrote:
> On 14/02/2023 02:37, Laurent Pinchart wrote:
> > To prepare for a rework of the LVDS disable code, which will need to be
> > called from rcar_lvds_pclk_disable(), move the LVDS enable code,
> > currently stored in the __rcar_lvds_atomic_enable() function, to a
> > separate code section separate from bridge operations. It will be then
> > extended with the LVDS disable code.
> >
> > As part of this rework the __rcar_lvds_atomic_enable() function is
> > renamed to rcar_lvds_enable() to more clearly indicate its purpose.
> >
> > No functional change intended.
>
> The desc is a bit confusing, as it talks about moving LVDS enable code,
> but the diff shows you moving the lvds pclk enable/disable code. Other
> than that:
I moved the enable code, but git showed the diff differently. As the
goal was to move the enable code to later add disable code next to it,
I'll keep the commit message as-is.
> Reviewed-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
>
> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> > drivers/gpu/drm/rcar-du/rcar_lvds.c | 97 +++++++++++++++--------------
> > 1 file changed, 50 insertions(+), 47 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> > index 61de18af62e6..70cdd5ec64d5 100644
> > --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
> > +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> > @@ -311,46 +311,7 @@ static void rcar_lvds_pll_setup_d3_e3(struct rcar_lvds *lvds, unsigned int freq)
> > }
> >
> > /* -----------------------------------------------------------------------------
> > - * Clock - D3/E3 only
> > - */
> > -
> > -int rcar_lvds_pclk_enable(struct drm_bridge *bridge, unsigned long freq)
> > -{
> > - struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
> > - int ret;
> > -
> > - if (WARN_ON(!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)))
> > - return -ENODEV;
> > -
> > - dev_dbg(lvds->dev, "enabling LVDS PLL, freq=%luHz\n", freq);
> > -
> > - ret = pm_runtime_resume_and_get(lvds->dev);
> > - if (ret)
> > - return ret;
> > -
> > - __rcar_lvds_pll_setup_d3_e3(lvds, freq, true);
> > -
> > - return 0;
> > -}
> > -EXPORT_SYMBOL_GPL(rcar_lvds_pclk_enable);
> > -
> > -void rcar_lvds_pclk_disable(struct drm_bridge *bridge)
> > -{
> > - struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
> > -
> > - if (WARN_ON(!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)))
> > - return;
> > -
> > - dev_dbg(lvds->dev, "disabling LVDS PLL\n");
> > -
> > - rcar_lvds_write(lvds, LVDPLLCR, 0);
> > -
> > - pm_runtime_put_sync(lvds->dev);
> > -}
> > -EXPORT_SYMBOL_GPL(rcar_lvds_pclk_disable);
> > -
> > -/* -----------------------------------------------------------------------------
> > - * Bridge
> > + * Enable/disable
> > */
> >
> > static enum rcar_lvds_mode rcar_lvds_get_lvds_mode(struct rcar_lvds *lvds,
> > @@ -394,10 +355,10 @@ static enum rcar_lvds_mode rcar_lvds_get_lvds_mode(struct rcar_lvds *lvds,
> > return mode;
> > }
> >
> > -static void __rcar_lvds_atomic_enable(struct drm_bridge *bridge,
> > - struct drm_atomic_state *state,
> > - struct drm_crtc *crtc,
> > - struct drm_connector *connector)
> > +static void rcar_lvds_enable(struct drm_bridge *bridge,
> > + struct drm_atomic_state *state,
> > + struct drm_crtc *crtc,
> > + struct drm_connector *connector)
> > {
> > struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
> > u32 lvdhcr;
> > @@ -410,8 +371,7 @@ static void __rcar_lvds_atomic_enable(struct drm_bridge *bridge,
> >
> > /* Enable the companion LVDS encoder in dual-link mode. */
> > if (lvds->link_type != RCAR_LVDS_SINGLE_LINK && lvds->companion)
> > - __rcar_lvds_atomic_enable(lvds->companion, state, crtc,
> > - connector);
> > + rcar_lvds_enable(lvds->companion, state, crtc, connector);
> >
> > /*
> > * Hardcode the channels and control signals routing for now.
> > @@ -531,6 +491,49 @@ static void __rcar_lvds_atomic_enable(struct drm_bridge *bridge,
> > rcar_lvds_write(lvds, LVDCR0, lvdcr0);
> > }
> >
> > +/* -----------------------------------------------------------------------------
> > + * Clock - D3/E3 only
> > + */
> > +
> > +int rcar_lvds_pclk_enable(struct drm_bridge *bridge, unsigned long freq)
> > +{
> > + struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
> > + int ret;
> > +
> > + if (WARN_ON(!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)))
> > + return -ENODEV;
> > +
> > + dev_dbg(lvds->dev, "enabling LVDS PLL, freq=%luHz\n", freq);
> > +
> > + ret = pm_runtime_resume_and_get(lvds->dev);
> > + if (ret)
> > + return ret;
> > +
> > + __rcar_lvds_pll_setup_d3_e3(lvds, freq, true);
> > +
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(rcar_lvds_pclk_enable);
> > +
> > +void rcar_lvds_pclk_disable(struct drm_bridge *bridge)
> > +{
> > + struct rcar_lvds *lvds = bridge_to_rcar_lvds(bridge);
> > +
> > + if (WARN_ON(!(lvds->info->quirks & RCAR_LVDS_QUIRK_EXT_PLL)))
> > + return;
> > +
> > + dev_dbg(lvds->dev, "disabling LVDS PLL\n");
> > +
> > + rcar_lvds_write(lvds, LVDPLLCR, 0);
> > +
> > + pm_runtime_put_sync(lvds->dev);
> > +}
> > +EXPORT_SYMBOL_GPL(rcar_lvds_pclk_disable);
> > +
> > +/* -----------------------------------------------------------------------------
> > + * Bridge
> > + */
> > +
> > static void rcar_lvds_atomic_enable(struct drm_bridge *bridge,
> > struct drm_bridge_state *old_bridge_state)
> > {
> > @@ -542,7 +545,7 @@ static void rcar_lvds_atomic_enable(struct drm_bridge *bridge,
> > bridge->encoder);
> > crtc = drm_atomic_get_new_connector_state(state, connector)->crtc;
> >
> > - __rcar_lvds_atomic_enable(bridge, state, crtc, connector);
> > + rcar_lvds_enable(bridge, state, crtc, connector);
> > }
> >
> > static void rcar_lvds_atomic_disable(struct drm_bridge *bridge,
>
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2023-02-15 8:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-14 0:37 [PATCH 0/3] drm: rcar-du: Fix vblank wait timeout when stopping LVDS output Laurent Pinchart
2023-02-14 0:37 ` [PATCH 1/3] drm: rcar-du: lvds: Call function directly instead of through pointer Laurent Pinchart
2023-02-15 6:18 ` Tomi Valkeinen
2023-02-14 0:37 ` [PATCH 2/3] drm: rcar-du: lvds: Move LVDS enable code to separate code section Laurent Pinchart
2023-02-14 8:25 ` Geert Uytterhoeven
2023-02-14 8:25 ` Geert Uytterhoeven
2023-02-15 6:20 ` Tomi Valkeinen
2023-02-15 8:34 ` Laurent Pinchart [this message]
2023-02-15 8:34 ` Laurent Pinchart
2023-02-14 0:37 ` [PATCH 3/3] drm: rcar-du: lvds: Fix LVDS PLL disable on D3/E3 Laurent Pinchart
2023-02-15 6:29 ` Tomi Valkeinen
2023-02-15 10:19 ` Laurent Pinchart
2023-02-15 10:19 ` Laurent Pinchart
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=Y+yY+ht8nLKX/0iJ@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kieran.bingham@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: link
Be 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.