drm/stm: ltdc: restore calls to clk_{enable/disable}

Submitted by Benjamin GAIGNARD on May 27, 2019, 11:58 a.m.

Details

Message ID 20190527115830.15836-1-benjamin.gaignard@st.com
State Accepted
Commit cf57fdc8e42bd88dae1213a2bbe683d4b6c2190b
Headers show
Series "drm/stm: ltdc: restore calls to clk_{enable/disable}" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Benjamin GAIGNARD May 27, 2019, 11:58 a.m.
From: Benjamin Gaignard <benjamin.gaignard@linaro.org>

Restore calls to clk_{enable/disable} deleted after applying the wrong
version of the patch

Fixes: fd6905fca4f0 ("drm/stm: ltdc: remove clk_round_rate comment")

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
---
 drivers/gpu/drm/stm/ltdc.c | 2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
index ae2aaf2a62ee..ac29890edeb6 100644
--- a/drivers/gpu/drm/stm/ltdc.c
+++ b/drivers/gpu/drm/stm/ltdc.c
@@ -507,10 +507,12 @@  static bool ltdc_crtc_mode_fixup(struct drm_crtc *crtc,
 	struct ltdc_device *ldev = crtc_to_ltdc(crtc);
 	int rate = mode->clock * 1000;
 
+	clk_disable(ldev->pixel_clk);
 	if (clk_set_rate(ldev->pixel_clk, rate) < 0) {
 		DRM_ERROR("Cannot set rate (%dHz) for pixel clk\n", rate);
 		return false;
 	}
+	clk_enable(ldev->pixel_clk);
 
 	adjusted_mode->clock = clk_get_rate(ldev->pixel_clk) / 1000;
 

Comments

Hi Benjamin,

Many thanks for this fix (and more generally for pushing STM patches on 
misc :-)

Acked-by: Philippe Cornu <philippe.cornu@st.com>


Philippe :-)

On 5/27/19 1:58 PM, Benjamin Gaignard wrote:
> From: Benjamin Gaignard <benjamin.gaignard@linaro.org>

> 

> Restore calls to clk_{enable/disable} deleted after applying the wrong

> version of the patch

> 

> Fixes: fd6905fca4f0 ("drm/stm: ltdc: remove clk_round_rate comment")

> 

> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

> ---

>   drivers/gpu/drm/stm/ltdc.c | 2 ++

>   1 file changed, 2 insertions(+)

> 

> diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c

> index ae2aaf2a62ee..ac29890edeb6 100644

> --- a/drivers/gpu/drm/stm/ltdc.c

> +++ b/drivers/gpu/drm/stm/ltdc.c

> @@ -507,10 +507,12 @@ static bool ltdc_crtc_mode_fixup(struct drm_crtc *crtc,

>   	struct ltdc_device *ldev = crtc_to_ltdc(crtc);

>   	int rate = mode->clock * 1000;

>   

> +	clk_disable(ldev->pixel_clk);

>   	if (clk_set_rate(ldev->pixel_clk, rate) < 0) {

>   		DRM_ERROR("Cannot set rate (%dHz) for pixel clk\n", rate);

>   		return false;

>   	}

> +	clk_enable(ldev->pixel_clk);

>   

>   	adjusted_mode->clock = clk_get_rate(ldev->pixel_clk) / 1000;

>   

>
Le lun. 27 mai 2019 à 14:28, Philippe CORNU <philippe.cornu@st.com> a écrit :
>
> Hi Benjamin,
>
> Many thanks for this fix (and more generally for pushing STM patches on
> misc :-)
>
> Acked-by: Philippe Cornu <philippe.cornu@st.com>

Applied on drm-misc-next,
sorry for the mistake.

Benjamin
>
> Philippe :-)
>
> On 5/27/19 1:58 PM, Benjamin Gaignard wrote:
> > From: Benjamin Gaignard <benjamin.gaignard@linaro.org>
> >
> > Restore calls to clk_{enable/disable} deleted after applying the wrong
> > version of the patch
> >
> > Fixes: fd6905fca4f0 ("drm/stm: ltdc: remove clk_round_rate comment")
> >
> > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
> > ---
> >   drivers/gpu/drm/stm/ltdc.c | 2 ++
> >   1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
> > index ae2aaf2a62ee..ac29890edeb6 100644
> > --- a/drivers/gpu/drm/stm/ltdc.c
> > +++ b/drivers/gpu/drm/stm/ltdc.c
> > @@ -507,10 +507,12 @@ static bool ltdc_crtc_mode_fixup(struct drm_crtc *crtc,
> >       struct ltdc_device *ldev = crtc_to_ltdc(crtc);
> >       int rate = mode->clock * 1000;
> >
> > +     clk_disable(ldev->pixel_clk);
> >       if (clk_set_rate(ldev->pixel_clk, rate) < 0) {
> >               DRM_ERROR("Cannot set rate (%dHz) for pixel clk\n", rate);
> >               return false;
> >       }
> > +     clk_enable(ldev->pixel_clk);
> >
> >       adjusted_mode->clock = clk_get_rate(ldev->pixel_clk) / 1000;
> >
> >
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel