Re: [EXT] Re: [PATCH v2 12/15] drm/mxsfb: Improve the axi clock usage

[Robert Chiras]

Hi Stefan,

On Mi, 2019-08-14 at 13:06 +0200, Stefan Agner wrote:
> On 2019-08-14 12:48, Robert Chiras wrote:
> > 
> > Currently, the enable of the axi clock return status is ignored,
> > causing
> > issues when the enable fails then we try to disable it. Therefore,
> > it is
> > better to check the return status and disable it only when enable
> > succeeded.
> Is this actually the case in real world sometimes? Why is it failing?
When I noticed that fail, we had some restrictions in SCU firmware, so
that the clock cannot be enabled if the power domain was down. Still,
at that time I noticed it is redundant to have functions that checks if
a clock is NULL or not, since the clk_* functions are already doing
this.
> 
> I guess if we do this in one place, we should do it in all places
> (e.g.
> also in mxsfb_crtc_enable, mxsfb_plane_atomic_update..)
I add specific checks only in the vblank functions, because those
functions can be called before calling the pipe enable/disable
functions which enables the spefic power domain and, at this point, the
clock enable/disable calls should not fail.
> 
> --
> Stefan
> 
> > 
> > Also, remove the helper functions around clk_axi, since we can
> > directly
> > use the clk API function for enable/disable the clock. Those
> > functions
> > are already checking for NULL clk and returning 0 if that's the
> > case.
> 
> > 
> > 
> > Signed-off-by: Robert Chiras <robert.chiras@xxxxxxx>
> > Acked-by: Leonard Crestez <leonard.crestez@xxxxxxx>
> > ---
> > Âdrivers/gpu/drm/mxsfb/mxsfb_crtc.c |ÂÂ8 ++++----
> > Âdrivers/gpu/drm/mxsfb/mxsfb_drv.cÂÂ| 32 +++++++++++++-------------
> > ------
> > Âdrivers/gpu/drm/mxsfb/mxsfb_drv.hÂÂ|ÂÂ3 ---
> > Â3 files changed, 17 insertions(+), 26 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c
> > b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c
> > index a4ba368..e727f5e 100644
> > --- a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c
> > +++ b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c
> > @@ -408,7 +408,7 @@ void mxsfb_crtc_enable(struct mxsfb_drm_private
> > *mxsfb)
> > Â{
> > ÂÂÂÂÂÂdma_addr_t paddr;
> > 
> > -ÂÂÂÂÂmxsfb_enable_axi_clk(mxsfb);
> > +ÂÂÂÂÂclk_prepare_enable(mxsfb->clk_axi);
> > ÂÂÂÂÂÂwritel(0, mxsfb->base + LCDC_CTRL);
> > ÂÂÂÂÂÂmxsfb_crtc_mode_set_nofb(mxsfb);
> > 
> > @@ -425,7 +425,7 @@ void mxsfb_crtc_enable(struct mxsfb_drm_private
> > *mxsfb)
> > Âvoid mxsfb_crtc_disable(struct mxsfb_drm_private *mxsfb)
> > Â{
> > ÂÂÂÂÂÂmxsfb_disable_controller(mxsfb);
> > -ÂÂÂÂÂmxsfb_disable_axi_clk(mxsfb);
> > +ÂÂÂÂÂclk_disable_unprepare(mxsfb->clk_axi);
> > Â}
> > 
> > Âvoid mxsfb_plane_atomic_update(struct mxsfb_drm_private *mxsfb,
> > @@ -451,8 +451,8 @@ void mxsfb_plane_atomic_update(struct
> > mxsfb_drm_private *mxsfb,
> > 
> > ÂÂÂÂÂÂpaddr = mxsfb_get_fb_paddr(mxsfb);
> > ÂÂÂÂÂÂif (paddr) {
> > -ÂÂÂÂÂÂÂÂÂÂÂÂÂmxsfb_enable_axi_clk(mxsfb);
> > +ÂÂÂÂÂÂÂÂÂÂÂÂÂclk_prepare_enable(mxsfb->clk_axi);
> > ÂÂÂÂÂÂÂÂÂÂÂÂÂÂwritel(paddr, mxsfb->base + mxsfb->devdata-
> > >next_buf);
> > -ÂÂÂÂÂÂÂÂÂÂÂÂÂmxsfb_disable_axi_clk(mxsfb);
> > +ÂÂÂÂÂÂÂÂÂÂÂÂÂclk_disable_unprepare(mxsfb->clk_axi);
> > ÂÂÂÂÂÂ}
> > Â}
> > diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
> > b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
> > index 6dae2bd..694b287 100644
> > --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
> > +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
> > @@ -97,18 +97,6 @@ drm_pipe_to_mxsfb_drm_private(struct
> > drm_simple_display_pipe *pipe)
> > ÂÂÂÂÂÂreturn container_of(pipe, struct mxsfb_drm_private, pipe);
> > Â}
> > 
> > -void mxsfb_enable_axi_clk(struct mxsfb_drm_private *mxsfb)
> > -{
> > -ÂÂÂÂÂif (mxsfb->clk_axi)
> > -ÂÂÂÂÂÂÂÂÂÂÂÂÂclk_prepare_enable(mxsfb->clk_axi);
> > -}
> > -
> > -void mxsfb_disable_axi_clk(struct mxsfb_drm_private *mxsfb)
> > -{
> > -ÂÂÂÂÂif (mxsfb->clk_axi)
> > -ÂÂÂÂÂÂÂÂÂÂÂÂÂclk_disable_unprepare(mxsfb->clk_axi);
> > -}
> > -
> > Â/**
> > Â * mxsfb_atomic_helper_check - validate state object
> > Â * @dev: DRM device
> > @@ -229,25 +217,31 @@ static void mxsfb_pipe_update(struct
> > drm_simple_display_pipe *pipe,
> > Âstatic int mxsfb_pipe_enable_vblank(struct drm_simple_display_pipe
> > *pipe)
> > Â{
> > ÂÂÂÂÂÂstruct mxsfb_drm_private *mxsfb =
> > drm_pipe_to_mxsfb_drm_private(pipe);
> > +ÂÂÂÂÂint ret = 0;
> > +
> > +ÂÂÂÂÂret = clk_prepare_enable(mxsfb->clk_axi);
> > +ÂÂÂÂÂif (ret)
> > +ÂÂÂÂÂÂÂÂÂÂÂÂÂreturn ret;
> > 
> > ÂÂÂÂÂÂ/* Clear and enable VBLANK IRQ */
> > -ÂÂÂÂÂmxsfb_enable_axi_clk(mxsfb);
> > ÂÂÂÂÂÂwritel(CTRL1_CUR_FRAME_DONE_IRQ, mxsfb->base + LCDC_CTRL1 +
> > REG_CLR);
> > ÂÂÂÂÂÂwritel(CTRL1_CUR_FRAME_DONE_IRQ_EN, mxsfb->base + LCDC_CTRL1
> > + REG_SET);
> > -ÂÂÂÂÂmxsfb_disable_axi_clk(mxsfb);
> > +ÂÂÂÂÂclk_disable_unprepare(mxsfb->clk_axi);
> > 
> > -ÂÂÂÂÂreturn 0;
> > +ÂÂÂÂÂreturn ret;
> > Â}
> > 
> > Âstatic void mxsfb_pipe_disable_vblank(struct
> > drm_simple_display_pipe *pipe)
> > Â{
> > ÂÂÂÂÂÂstruct mxsfb_drm_private *mxsfb =
> > drm_pipe_to_mxsfb_drm_private(pipe);
> > 
> > +ÂÂÂÂÂif (clk_prepare_enable(mxsfb->clk_axi))
> > +ÂÂÂÂÂÂÂÂÂÂÂÂÂreturn;
> > +
> > ÂÂÂÂÂÂ/* Disable and clear VBLANK IRQ */
> > -ÂÂÂÂÂmxsfb_enable_axi_clk(mxsfb);
> > ÂÂÂÂÂÂwritel(CTRL1_CUR_FRAME_DONE_IRQ_EN, mxsfb->base + LCDC_CTRL1
> > + REG_CLR);
> > ÂÂÂÂÂÂwritel(CTRL1_CUR_FRAME_DONE_IRQ, mxsfb->base + LCDC_CTRL1 +
> > REG_CLR);
> > -ÂÂÂÂÂmxsfb_disable_axi_clk(mxsfb);
> > +ÂÂÂÂÂclk_disable_unprepare(mxsfb->clk_axi);
> > Â}
> > 
> > Âstatic struct drm_simple_display_pipe_funcs mxsfb_funcs = {
> > @@ -413,7 +407,7 @@ static irqreturn_t mxsfb_irq_handler(int irq,
> > void *data)
> > ÂÂÂÂÂÂstruct mxsfb_drm_private *mxsfb = drm->dev_private;
> > ÂÂÂÂÂÂu32 reg;
> > 
> > -ÂÂÂÂÂmxsfb_enable_axi_clk(mxsfb);
> > +ÂÂÂÂÂclk_prepare_enable(mxsfb->clk_axi);
> > 
> > ÂÂÂÂÂÂreg = readl(mxsfb->base + LCDC_CTRL1);
> > 
> > @@ -422,7 +416,7 @@ static irqreturn_t mxsfb_irq_handler(int irq,
> > void *data)
> > 
> > ÂÂÂÂÂÂwritel(CTRL1_CUR_FRAME_DONE_IRQ, mxsfb->base + LCDC_CTRL1 +
> > REG_CLR);
> > 
> > -ÂÂÂÂÂmxsfb_disable_axi_clk(mxsfb);
> > +ÂÂÂÂÂclk_disable_unprepare(mxsfb->clk_axi);
> > 
> > ÂÂÂÂÂÂreturn IRQ_HANDLED;
> > Â}
> > diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.h
> > b/drivers/gpu/drm/mxsfb/mxsfb_drv.h
> > index 8fb65d3..d6df8fe 100644
> > --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.h
> > +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.h
> > @@ -37,9 +37,6 @@ struct mxsfb_drm_private {
> > Âint mxsfb_setup_crtc(struct drm_device *dev);
> > Âint mxsfb_create_output(struct drm_device *dev);
> > 
> > -void mxsfb_enable_axi_clk(struct mxsfb_drm_private *mxsfb);
> > -void mxsfb_disable_axi_clk(struct mxsfb_drm_private *mxsfb);
> > -
> > Âvoid mxsfb_crtc_enable(struct mxsfb_drm_private *mxsfb);
> > Âvoid mxsfb_crtc_disable(struct mxsfb_drm_private *mxsfb);
> > Âvoid mxsfb_plane_atomic_update(struct mxsfb_drm_private *mxsfb,

Thanks,
Robert