drm/imx: imx-ldb: Disable both channels for split mode in enc->disable()
diff mbox series

Message ID 1589268718-29837-1-git-send-email-victor.liu@nxp.com
State New
Headers show
Series
  • drm/imx: imx-ldb: Disable both channels for split mode in enc->disable()
Related show

Commit Message

Liu Ying May 12, 2020, 7:31 a.m. UTC
Both of the two LVDS channels should be disabled for split mode
in the encoder's ->disable() callback, because they are enabled
in the encoder's ->enable() callback.

Fixes: 6556f7f82b9c ("drm: imx: Move imx-drm driver out of staging")
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Liu Ying <victor.liu@nxp.com>
---
 drivers/gpu/drm/imx/imx-ldb.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Liu Ying May 28, 2020, 2:58 a.m. UTC | #1
Gentle ping...

On Tue, 2020-05-12 at 15:31 +0800, Liu Ying wrote:
> Both of the two LVDS channels should be disabled for split mode
> in the encoder's ->disable() callback, because they are enabled
> in the encoder's ->enable() callback.
> 
> Fixes: 6556f7f82b9c ("drm: imx: Move imx-drm driver out of staging")
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
> Cc: NXP Linux Team <linux-imx@nxp.com>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Liu Ying <victor.liu@nxp.com>
> ---
>  drivers/gpu/drm/imx/imx-ldb.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-
> ldb.c
> index 4da22a9..af4d0d8 100644
> --- a/drivers/gpu/drm/imx/imx-ldb.c
> +++ b/drivers/gpu/drm/imx/imx-ldb.c
> @@ -303,18 +303,19 @@ static void imx_ldb_encoder_disable(struct
> drm_encoder *encoder)
>  {
>  	struct imx_ldb_channel *imx_ldb_ch =
> enc_to_imx_ldb_ch(encoder);
>  	struct imx_ldb *ldb = imx_ldb_ch->ldb;
> +	int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
>  	int mux, ret;
>  
>  	drm_panel_disable(imx_ldb_ch->panel);
>  
> -	if (imx_ldb_ch == &ldb->channel[0])
> +	if (imx_ldb_ch == &ldb->channel[0] || dual)
>  		ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK;
> -	else if (imx_ldb_ch == &ldb->channel[1])
> +	if (imx_ldb_ch == &ldb->channel[1] || dual)
>  		ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK;
>  
>  	regmap_write(ldb->regmap, IOMUXC_GPR2, ldb->ldb_ctrl);
>  
> -	if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) {
> +	if (dual) {
>  		clk_disable_unprepare(ldb->clk[0]);
>  		clk_disable_unprepare(ldb->clk[1]);
>  	}
Marco Felsch May 28, 2020, 9:31 a.m. UTC | #2
Hi Liu

On 20-05-28 10:58, Liu Ying wrote:
> Gentle ping...

Please check my "spring cleanup series" [1] which do the split:

[1] https://www.spinics.net/lists/arm-kernel/msg789309.html

Regards,
  Marco

> On Tue, 2020-05-12 at 15:31 +0800, Liu Ying wrote:
> > Both of the two LVDS channels should be disabled for split mode
> > in the encoder's ->disable() callback, because they are enabled
> > in the encoder's ->enable() callback.
> > 
> > Fixes: 6556f7f82b9c ("drm: imx: Move imx-drm driver out of staging")
> > Cc: Philipp Zabel <p.zabel@pengutronix.de>
> > Cc: Sascha Hauer <s.hauer@pengutronix.de>
> > Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
> > Cc: NXP Linux Team <linux-imx@nxp.com>
> > Cc: <stable@vger.kernel.org>
> > Signed-off-by: Liu Ying <victor.liu@nxp.com>
> > ---
> >  drivers/gpu/drm/imx/imx-ldb.c | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-
> > ldb.c
> > index 4da22a9..af4d0d8 100644
> > --- a/drivers/gpu/drm/imx/imx-ldb.c
> > +++ b/drivers/gpu/drm/imx/imx-ldb.c
> > @@ -303,18 +303,19 @@ static void imx_ldb_encoder_disable(struct
> > drm_encoder *encoder)
> >  {
> >  	struct imx_ldb_channel *imx_ldb_ch =
> > enc_to_imx_ldb_ch(encoder);
> >  	struct imx_ldb *ldb = imx_ldb_ch->ldb;
> > +	int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
> >  	int mux, ret;
> >  
> >  	drm_panel_disable(imx_ldb_ch->panel);
> >  
> > -	if (imx_ldb_ch == &ldb->channel[0])
> > +	if (imx_ldb_ch == &ldb->channel[0] || dual)
> >  		ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK;
> > -	else if (imx_ldb_ch == &ldb->channel[1])
> > +	if (imx_ldb_ch == &ldb->channel[1] || dual)
> >  		ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK;
> >  
> >  	regmap_write(ldb->regmap, IOMUXC_GPR2, ldb->ldb_ctrl);
> >  
> > -	if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) {
> > +	if (dual) {
> >  		clk_disable_unprepare(ldb->clk[0]);
> >  		clk_disable_unprepare(ldb->clk[1]);
> >  	}
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
Liu Ying May 28, 2020, 10:02 a.m. UTC | #3
Hi Marco,

On Thu, 2020-05-28 at 11:31 +0200, Marco Felsch wrote:
> Hi Liu
> 
> On 20-05-28 10:58, Liu Ying wrote:
> > Gentle ping...
> 
> Please check my "spring cleanup series" [1] which do the split:

It looks that your series doesn't disable both lvds channels in the
encoder disablement callback for the ldb split mode.
So, I think this patch still stands.

Regards,
Liu Ying

> 
> [1] 
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.spinics.net%2Flists%2Farm-kernel%2Fmsg789309.html&amp;data=02%7C01%7Cvictor.liu%40nxp.com%7Cd177bf874b8f41c404e108d802e9f179%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637262551086663318&amp;sdata=PIMNspESt%2BYqEMV1Vh0eBn5PNjKPfz5GdJ6NrnM2bUw%3D&amp;reserved=0
> 
> Regards,
>   Marco
> 
> > On Tue, 2020-05-12 at 15:31 +0800, Liu Ying wrote:
> > > Both of the two LVDS channels should be disabled for split mode
> > > in the encoder's ->disable() callback, because they are enabled
> > > in the encoder's ->enable() callback.
> > > 
> > > Fixes: 6556f7f82b9c ("drm: imx: Move imx-drm driver out of
> > > staging")
> > > Cc: Philipp Zabel <p.zabel@pengutronix.de>
> > > Cc: Sascha Hauer <s.hauer@pengutronix.de>
> > > Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
> > > Cc: NXP Linux Team <linux-imx@nxp.com>
> > > Cc: <stable@vger.kernel.org>
> > > Signed-off-by: Liu Ying <victor.liu@nxp.com>
> > > ---
> > >  drivers/gpu/drm/imx/imx-ldb.c | 7 ++++---
> > >  1 file changed, 4 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/imx/imx-ldb.c
> > > b/drivers/gpu/drm/imx/imx-
> > > ldb.c
> > > index 4da22a9..af4d0d8 100644
> > > --- a/drivers/gpu/drm/imx/imx-ldb.c
> > > +++ b/drivers/gpu/drm/imx/imx-ldb.c
> > > @@ -303,18 +303,19 @@ static void imx_ldb_encoder_disable(struct
> > > drm_encoder *encoder)
> > >  {
> > >  	struct imx_ldb_channel *imx_ldb_ch =
> > > enc_to_imx_ldb_ch(encoder);
> > >  	struct imx_ldb *ldb = imx_ldb_ch->ldb;
> > > +	int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
> > >  	int mux, ret;
> > >  
> > >  	drm_panel_disable(imx_ldb_ch->panel);
> > >  
> > > -	if (imx_ldb_ch == &ldb->channel[0])
> > > +	if (imx_ldb_ch == &ldb->channel[0] || dual)
> > >  		ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK;
> > > -	else if (imx_ldb_ch == &ldb->channel[1])
> > > +	if (imx_ldb_ch == &ldb->channel[1] || dual)
> > >  		ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK;
> > >  
> > >  	regmap_write(ldb->regmap, IOMUXC_GPR2, ldb->ldb_ctrl);
> > >  
> > > -	if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) {
> > > +	if (dual) {
> > >  		clk_disable_unprepare(ldb->clk[0]);
> > >  		clk_disable_unprepare(ldb->clk[1]);
> > >  	}
> > 
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Fdri-devel&amp;data=02%7C01%7Cvictor.liu%40nxp.com%7Cd177bf874b8f41c404e108d802e9f179%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637262551086663318&amp;sdata=lNC4lwLUqM0upUxrrBtk1ap423lBIQlAAqDjdHv92LI%3D&amp;reserved=0
> >

Patch
diff mbox series

diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 4da22a9..af4d0d8 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -303,18 +303,19 @@  static void imx_ldb_encoder_disable(struct drm_encoder *encoder)
 {
 	struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);
 	struct imx_ldb *ldb = imx_ldb_ch->ldb;
+	int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN;
 	int mux, ret;
 
 	drm_panel_disable(imx_ldb_ch->panel);
 
-	if (imx_ldb_ch == &ldb->channel[0])
+	if (imx_ldb_ch == &ldb->channel[0] || dual)
 		ldb->ldb_ctrl &= ~LDB_CH0_MODE_EN_MASK;
-	else if (imx_ldb_ch == &ldb->channel[1])
+	if (imx_ldb_ch == &ldb->channel[1] || dual)
 		ldb->ldb_ctrl &= ~LDB_CH1_MODE_EN_MASK;
 
 	regmap_write(ldb->regmap, IOMUXC_GPR2, ldb->ldb_ctrl);
 
-	if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) {
+	if (dual) {
 		clk_disable_unprepare(ldb->clk[0]);
 		clk_disable_unprepare(ldb->clk[1]);
 	}