Skip to contentSkip to conversation

drm/arm: fixes pixel clock enabled with wrong format

PATCH In review Bernard Zhao 3 participants 7 messages Apr 24, 2020 – May 18, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drm/arm: fixes pixel clock enabled with wrong format

The pixel clock is still enabled when the format is wrong. no error branch handle, and also some register is not set in this case, e.g: HDLCD_REG_<color>_SELECT. Maybe we should disable this clock and throw an warn message when this happened.
With this change, the code maybe a bit more readable.

Changes since V1:
*add format error handle, if format is not correct, throw an warning message and disable this clock.

Link for V1:
*https://lore.kernel.org/patchwork/patch/1228501/

---
 drivers/gpu/drm/arm/hdlcd_crtc.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/arm/hdlcd_crtc.c +9 -4
index af67fefed38d..f3945dee2b7d 100644
@@ -96,7 +96,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
 	}
 
 	if (WARN_ON(!format))
-		return 0;
+		return -EINVAL;
 
 	/* HDLCD uses 'bytes per pixel', zero means 1 byte */
 	btpp = (format->bits_per_pixel + 7) / 8;
@@ -125,7 +125,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
 	return 0;
 }
 
-static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
+static int hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
 {
 	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 	struct drm_display_mode *m = &crtc->state->adjusted_mode;
@@ -162,9 +162,10 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
 
 	err = hdlcd_set_pxl_fmt(crtc);
 	if (err)
-		return;
+		return err;
 
 	clk_set_rate(hdlcd->clk, m->crtc_clock * 1000);
+	return 0;
 }
 
 static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,
@@ -173,7 +174,11 @@ static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,
 	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 
 	clk_prepare_enable(hdlcd->clk);
-	hdlcd_crtc_mode_set_nofb(crtc);
+	if (hdlcd_crtc_mode_set_nofb(crtc)) {
+		DRM_DEBUG_KMS("Invalid format, pixel clock enable failed!\n");
+		clk_disable_unprepare(hdlcd->clk);
+		return;
+	}
 	hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1);
 	drm_crtc_vblank_on(crtc);
 }
Signature · 1 line
2.26.2
#1 lore raw

Hi Bernard,

Quoted 55 lines · Bernard Zhao

The pixel clock is still enabled when the format is wrong. no error branch handle, and also some register is not set in this case, e.g: HDLCD_REG_<color>_SELECT. Maybe we should disable this clock and throw an warn message when this happened.
With this change, the code maybe a bit more readable.

Changes since V1:
*add format error handle, if format is not correct, throw an warning message and disable this clock.

Link for V1:
*https://lore.kernel.org/patchwork/patch/1228501/

---
 drivers/gpu/drm/arm/hdlcd_crtc.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/arm/hdlcd_crtc.c +4 -3
index af67fefed38d..f3945dee2b7d 100644
@@ -96,7 +96,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
        }
 
        if (WARN_ON(!format))
-               return 0;
+               return -EINVAL;
 
        /* HDLCD uses 'bytes per pixel', zero means 1 byte */
        btpp = (format->bits_per_pixel + 7) / 8;
@@ -125,7 +125,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
        return 0;
 }
 
-static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
+static int hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
 {
        struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
        struct drm_display_mode *m = &crtc->state->adjusted_mode;
@@ -162,9 +162,10 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
 
        err = hdlcd_set_pxl_fmt(crtc);
        if (err)
-               return;
+               return err;
 
        clk_set_rate(hdlcd->clk, m->crtc_clock * 1000);
+       return 0;
 }
 
 static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,

drivers/gpu/drm/arm/hdlcd_crtc.c static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc, · line 181

Quoted 9 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +5 -1
@@ -173,7 +174,11 @@ static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,
        struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 
        clk_prepare_enable(hdlcd->clk);
-       hdlcd_crtc_mode_set_nofb(crtc);
+       if (hdlcd_crtc_mode_set_nofb(crtc)) {
+               DRM_DEBUG_KMS("Invalid format, pixel clock enable failed!\n");
+               clk_disable_unprepare(hdlcd->clk);
+               return;
+       }

This doesn't seem right. As far as I can tell, the state must be checked in the .atomic_check since .atomic_enable, intentionally, "cannot" fail.

HTH
Emil

Quoted 10 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +0 -1
        hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1);
        drm_crtc_vblank_on(crtc);
 }
--

2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

maintainer
#2 lore raw
In reply to Bernard Zhao

Hi Bernand,

Quoted 24 lines · Bernard Zhao

The pixel clock is still enabled when the format is wrong. no error branch handle, and also some register is not set in this case, e.g: HDLCD_REG_<color>_SELECT. Maybe we should disable this clock and throw an warn message when this happened.
With this change, the code maybe a bit more readable.

Changes since V1:
*add format error handle, if format is not correct, throw an warning message and disable this clock.

Link for V1:
*https://lore.kernel.org/patchwork/patch/1228501/

---
 drivers/gpu/drm/arm/hdlcd_crtc.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/arm/hdlcd_crtc.c +0 -0
index af67fefed38d..f3945dee2b7d 100644

drivers/gpu/drm/arm/hdlcd_crtc.c static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) · line 99

Quoted 5 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -1
@@ -96,7 +96,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
 	}
 
 	if (WARN_ON(!format))
-		return 0;
+		return -EINVAL;

That is the right fix!

drivers/gpu/drm/arm/hdlcd_crtc.c static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) · line 128

Quoted 9 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -1
 	/* HDLCD uses 'bytes per pixel', zero means 1 byte */
 	btpp = (format->bits_per_pixel + 7) / 8;
@@ -125,7 +125,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
 	return 0;
 }
 
-static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
+static int hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)

But this is not. We don't need to propagate the error further, just ....

drivers/gpu/drm/arm/hdlcd_crtc.c static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc) · line 165

Quoted 8 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +0 -1
 {
 	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 	struct drm_display_mode *m = &crtc->state->adjusted_mode;
@@ -162,9 +162,10 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
 
 	err = hdlcd_set_pxl_fmt(crtc);
 	if (err)
-		return;

... return here so that we don't call clk_set_rate();

Best regards,
Liviu

Quoted 23 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +7 -1
+		return err;
 
 	clk_set_rate(hdlcd->clk, m->crtc_clock * 1000);
+	return 0;
 }
 
 static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,
@@ -173,7 +174,11 @@ static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,
 	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 
 	clk_prepare_enable(hdlcd->clk);
-	hdlcd_crtc_mode_set_nofb(crtc);
+	if (hdlcd_crtc_mode_set_nofb(crtc)) {
+		DRM_DEBUG_KMS("Invalid format, pixel clock enable failed!\n");
+		clk_disable_unprepare(hdlcd->clk);
+		return;
+	}
 	hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1);
 	drm_crtc_vblank_on(crtc);
 }
Signature · 1 line
2.26.2
Signature · 12 lines
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author
#3 lore raw

From: Liviu Dudau <[email protected]>
Date: 2020-04-24 19:09:50
To: Bernard Zhao <[email protected]>
Cc: Brian Starkey <[email protected]>,David Airlie <[email protected]>,Daniel Vetter <[email protected]>,[email protected],[email protected],[email protected]
Subject: Re: [PATCH v2] drm/arm: fixes pixel clock enabled with wrong format>Hi Bernand,

Quoted 51 lines · Bernard Zhao
Quoted 24 lines

The pixel clock is still enabled when the format is wrong. no error branch handle, and also some register is not set in this case, e.g: HDLCD_REG_<color>_SELECT. Maybe we should disable this clock and throw an warn message when this happened.
With this change, the code maybe a bit more readable.

Changes since V1:
*add format error handle, if format is not correct, throw an warning message and disable this clock.

Link for V1:
*https://lore.kernel.org/patchwork/patch/1228501/

---
 drivers/gpu/drm/arm/hdlcd_crtc.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/arm/hdlcd_crtc.c +0 -0
index af67fefed38d..f3945dee2b7d 100644

drivers/gpu/drm/arm/hdlcd_crtc.c static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) · line 99

Quoted 5 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -1
@@ -96,7 +96,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
 	}
 
 	if (WARN_ON(!format))
-		return 0;
+		return -EINVAL;

That is the right fix!

drivers/gpu/drm/arm/hdlcd_crtc.c static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) · line 128

Quoted 9 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -1
 	/* HDLCD uses 'bytes per pixel', zero means 1 byte */
 	btpp = (format->bits_per_pixel + 7) / 8;
@@ -125,7 +125,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
 	return 0;
 }
 
-static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
+static int hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)

But this is not. We don't need to propagate the error further, just ....

Quoted 5 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +0 -0
 {
 	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 	struct drm_display_mode *m = &crtc->state->adjusted_mode;
@@ -162,9 +162,10 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
 
Quoted 4 lines

drivers/gpu/drm/arm/hdlcd_crtc.c static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc) · line 165

Quoted 3 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +0 -1
 	err = hdlcd_set_pxl_fmt(crtc);
 	if (err)
-		return;

My previous understanding was that when such an exception occurred, it was caught

in the atomic_enable interface, and then disable pixel clock. I am not sure is this ok or i have to do more register clean operaction.

Quoted 1 line

... return here so that we don't call clk_set_rate();

And for this part, i am a little confused :
1 clk_set_rate must be set even if format is wrong?
2 The original code logic shows that If format is not correct, we will not set registers HDLCD_REG_PIXEL_FORMAT & HDLCD_REG_<color>_SELECT, will this bring in
any problems?
3 if 1 the rate must set & 2 registers above doesn`t matter, then maybe there is no need to disable pixel clock.

Regards,
Bernard

Quoted 1 line

drivers/gpu/drm/arm/hdlcd_crtc.c static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc) · line 165

Quoted 1 line
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -0
+ return err; >> >> clk_set_rate(hdlcd->clk, m->crtc_clock * 1000); >> + return 0; >> } >> >> static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc, >> @@ -173,7 +174,11 @@ static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc, >> struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc); >> >> clk_prepare_enable(hdlcd->clk); >> - hdlcd_crtc_mode_set_nofb(crtc); >> + if (hdlcd_crtc_mode_set_nofb(crtc)) { >> + DRM_DEBUG_KMS("Invalid format, pixel clock enable failed!\n"); >> + clk_disable_unprepare(hdlcd->clk); >> + return; >> + } >> hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1); >> drm_crtc_vblank_on(crtc); >> } >> -- >> 2.26.2 >> > >-- >==================== >| I would like to | >| fix the world, | >| but they're not | >| giving me the | > \ source code! / > --------------- > ¯\_(ツ)_/¯

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author
#4 lore raw

From: "赵军奎" <[email protected]>
Date: 2020-04-24 19:37:36
To: Liviu Dudau <[email protected]>
Cc: Brian Starkey <[email protected]>,David Airlie <[email protected]>,Daniel Vetter <[email protected]>,[email protected],[email protected],[email protected]
Subject: Re:Re: [PATCH v2] drm/arm: fixes pixel clock enabled with wrong format

From: Liviu Dudau <[email protected]>
Date: 2020-04-24 19:09:50
To: Bernard Zhao <[email protected]>
Cc: Brian Starkey <[email protected]>,David Airlie <[email protected]>,Daniel Vetter <[email protected]>,[email protected],[email protected],[email protected]
Subject: Re: [PATCH v2] drm/arm: fixes pixel clock enabled with wrong format>Hi Bernand,

Quoted 46 lines · Bernard Zhao
Quoted 24 lines

The pixel clock is still enabled when the format is wrong. no error branch handle, and also some register is not set in this case, e.g: HDLCD_REG_<color>_SELECT. Maybe we should disable this clock and throw an warn message when this happened.
With this change, the code maybe a bit more readable.

Changes since V1:
*add format error handle, if format is not correct, throw an warning message and disable this clock.

Link for V1:
*https://lore.kernel.org/patchwork/patch/1228501/

---
 drivers/gpu/drm/arm/hdlcd_crtc.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/arm/hdlcd_crtc.c +0 -0
index af67fefed38d..f3945dee2b7d 100644

drivers/gpu/drm/arm/hdlcd_crtc.c static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) · line 99

Quoted 5 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -1
@@ -96,7 +96,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
 	}
 
 	if (WARN_ON(!format))
-		return 0;
+		return -EINVAL;

That is the right fix!

drivers/gpu/drm/arm/hdlcd_crtc.c static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) · line 128

Quoted 9 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -1
 	/* HDLCD uses 'bytes per pixel', zero means 1 byte */
 	btpp = (format->bits_per_pixel + 7) / 8;
@@ -125,7 +125,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
 	return 0;
 }
 
-static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
+static int hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)

But this is not. We don't need to propagate the error further, just ....

Quoted 9 lines

drivers/gpu/drm/arm/hdlcd_crtc.c static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc) · line 165

Quoted 8 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +0 -1
 {
 	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 	struct drm_display_mode *m = &crtc->state->adjusted_mode;
@@ -162,9 +162,10 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
 
 	err = hdlcd_set_pxl_fmt(crtc);
 	if (err)
-		return;

My previous understanding was that when such an exception occurred, it was caught in the atomic_enable interface, and then disable pixel clock. I am not sure is this ok or i have to do more register clean operaction.

Quoted 1 line

... return here so that we don't call clk_set_rate();

And for this part, i am a little confused :
1 clk_set_rate must be set even if format is wrong?
2 The original code logic shows that If format is not correct, we will not set registers HDLCD_REG_PIXEL_FORMAT & HDLCD_REG_<color>_SELECT, will this bring in
any problems?
3 if 1 the rate must set & 2 registers above doesn`t matter, then maybe there is no need to disable pixel clock.
Am i misunderstanding

Regards,
Bernard

Quoted 33 lines
Quoted 23 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +7 -1
+		return err;
 
 	clk_set_rate(hdlcd->clk, m->crtc_clock * 1000);
+	return 0;
 }
 
 static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,
@@ -173,7 +174,11 @@ static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,
 	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 
 	clk_prepare_enable(hdlcd->clk);
-	hdlcd_crtc_mode_set_nofb(crtc);
+	if (hdlcd_crtc_mode_set_nofb(crtc)) {
+		DRM_DEBUG_KMS("Invalid format, pixel clock enable failed!\n");
+		clk_disable_unprepare(hdlcd->clk);
+		return;
+	}
 	hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1);
 	drm_crtc_vblank_on(crtc);
 }
Signature · 1 line
2.26.2
Signature · 8 lines
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
\ source code!  /
 ---------------
   ¯\_(ツ)_/¯
maintainer
#5 lore raw

Hi Bernard,

Quoted 75 lines · Bernard

From: "赵军奎" <[email protected]>
Date: 2020-04-24 19:37:36
To: Liviu Dudau <[email protected]>
Cc: Brian Starkey <[email protected]>,David Airlie <[email protected]>,Daniel Vetter <[email protected]>,[email protected],[email protected],[email protected]
Subject: Re:Re: [PATCH v2] drm/arm: fixes pixel clock enabled with wrong format

From: Liviu Dudau <[email protected]>
Date: 2020-04-24 19:09:50
To: Bernard Zhao <[email protected]>
Cc: Brian Starkey <[email protected]>,David Airlie <[email protected]>,Daniel Vetter <[email protected]>,[email protected],[email protected],[email protected]
Subject: Re: [PATCH v2] drm/arm: fixes pixel clock enabled with wrong format>Hi Bernand,

Quoted 46 lines · Bernard Zhao
Quoted 24 lines

The pixel clock is still enabled when the format is wrong. no error branch handle, and also some register is not set in this case, e.g: HDLCD_REG_<color>_SELECT. Maybe we should disable this clock and throw an warn message when this happened.
With this change, the code maybe a bit more readable.

Changes since V1:
*add format error handle, if format is not correct, throw an warning message and disable this clock.

Link for V1:
*https://lore.kernel.org/patchwork/patch/1228501/

---
 drivers/gpu/drm/arm/hdlcd_crtc.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/arm/hdlcd_crtc.c +0 -0
index af67fefed38d..f3945dee2b7d 100644

drivers/gpu/drm/arm/hdlcd_crtc.c static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) · line 99

Quoted 5 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -1
@@ -96,7 +96,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
 	}
 
 	if (WARN_ON(!format))
-		return 0;
+		return -EINVAL;

That is the right fix!

drivers/gpu/drm/arm/hdlcd_crtc.c static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) · line 128

Quoted 9 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -1
 	/* HDLCD uses 'bytes per pixel', zero means 1 byte */
 	btpp = (format->bits_per_pixel + 7) / 8;
@@ -125,7 +125,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
 	return 0;
 }
 
-static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
+static int hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)

But this is not. We don't need to propagate the error further, just ....

Quoted 9 lines

drivers/gpu/drm/arm/hdlcd_crtc.c static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc) · line 165

Quoted 8 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +0 -1
 {
 	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 	struct drm_display_mode *m = &crtc->state->adjusted_mode;
@@ -162,9 +162,10 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
 
 	err = hdlcd_set_pxl_fmt(crtc);
 	if (err)
-		return;

My previous understanding was that when such an exception occurred, it was caught in the atomic_enable interface, and then disable pixel clock. I am not sure is this ok or i have to do more register clean operaction.

Quoted 1 line

... return here so that we don't call clk_set_rate();

Quoted 8 lines

And for this part, i am a little confused :
1 clk_set_rate must be set even if format is wrong?
2 The original code logic shows that If format is not correct, we will not set registers HDLCD_REG_PIXEL_FORMAT & HDLCD_REG_<color>_SELECT, will this bring in
any problems?
3 if 1 the rate must set & 2 registers above doesn`t matter, then maybe there is no need to disable pixel clock.
Am i misunderstanding

You are right, the pixel format check should not happen inside hdlcd_crtc_atomic_enable() hook, it should be moved into a separate function hdlcd_crtc_atomic_check() and that needs to be hooked into .atomic_check() for hdlcd_crtc_helper_funcs().

If you want to have another go I'll be happy to review and Ack your patch.

Best regards,
Liviu

Quoted 40 lines

Regards,
Bernard

Quoted 33 lines
Quoted 23 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +7 -1
+		return err;
 
 	clk_set_rate(hdlcd->clk, m->crtc_clock * 1000);
+	return 0;
 }
 
 static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,
@@ -173,7 +174,11 @@ static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,
 	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 
 	clk_prepare_enable(hdlcd->clk);
-	hdlcd_crtc_mode_set_nofb(crtc);
+	if (hdlcd_crtc_mode_set_nofb(crtc)) {
+		DRM_DEBUG_KMS("Invalid format, pixel clock enable failed!\n");
+		clk_disable_unprepare(hdlcd->clk);
+		return;
+	}
 	hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1);
 	drm_crtc_vblank_on(crtc);
 }
Signature · 1 line
2.26.2
Signature · 8 lines
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
\ source code!  /
 ---------------
   ¯\_(ツ)_/¯
Signature · 8 lines
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯
author
#6 lore raw

发件人:Liviu Dudau <[email protected]>
发送日期:2020-05-15 22:41:49
收件人:Bernard <[email protected]>
抄送人:Brian Starkey <[email protected]>,David Airlie <[email protected]>,Daniel Vetter <[email protected]>,[email protected],[email protected],[email protected] 主题:Re: Re:Re: [PATCH v2] drm/arm: fixes pixel clock enabled with wrong format>Hi Bernard,

Quoted 86 lines · Bernard
Quoted 75 lines

From: "赵军奎" <[email protected]>
Date: 2020-04-24 19:37:36
To: Liviu Dudau <[email protected]>
Cc: Brian Starkey <[email protected]>,David Airlie <[email protected]>,Daniel Vetter <[email protected]>,[email protected],[email protected],[email protected]
Subject: Re:Re: [PATCH v2] drm/arm: fixes pixel clock enabled with wrong format

From: Liviu Dudau <[email protected]>
Date: 2020-04-24 19:09:50
To: Bernard Zhao <[email protected]>
Cc: Brian Starkey <[email protected]>,David Airlie <[email protected]>,Daniel Vetter <[email protected]>,[email protected],[email protected],[email protected]
Subject: Re: [PATCH v2] drm/arm: fixes pixel clock enabled with wrong format>Hi Bernand,

Quoted 46 lines · Bernard Zhao
Quoted 24 lines

The pixel clock is still enabled when the format is wrong. no error branch handle, and also some register is not set in this case, e.g: HDLCD_REG_<color>_SELECT. Maybe we should disable this clock and throw an warn message when this happened.
With this change, the code maybe a bit more readable.

Changes since V1:
*add format error handle, if format is not correct, throw an warning message and disable this clock.

Link for V1:
*https://lore.kernel.org/patchwork/patch/1228501/

---
 drivers/gpu/drm/arm/hdlcd_crtc.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/arm/hdlcd_crtc.c +0 -0
index af67fefed38d..f3945dee2b7d 100644

drivers/gpu/drm/arm/hdlcd_crtc.c static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) · line 99

Quoted 5 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -1
@@ -96,7 +96,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
 	}
 
 	if (WARN_ON(!format))
-		return 0;
+		return -EINVAL;

That is the right fix!

drivers/gpu/drm/arm/hdlcd_crtc.c static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) · line 128

Quoted 9 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +1 -1
 	/* HDLCD uses 'bytes per pixel', zero means 1 byte */
 	btpp = (format->bits_per_pixel + 7) / 8;
@@ -125,7 +125,7 @@ static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc)
 	return 0;
 }
 
-static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
+static int hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)

But this is not. We don't need to propagate the error further, just ....

Quoted 9 lines

drivers/gpu/drm/arm/hdlcd_crtc.c static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc) · line 165

Quoted 8 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +0 -1
 {
 	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 	struct drm_display_mode *m = &crtc->state->adjusted_mode;
@@ -162,9 +162,10 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc)
 
 	err = hdlcd_set_pxl_fmt(crtc);
 	if (err)
-		return;

My previous understanding was that when such an exception occurred, it was caught in the atomic_enable interface, and then disable pixel clock. I am not sure is this ok or i have to do more register clean operaction.

Quoted 1 line

... return here so that we don't call clk_set_rate();

Quoted 8 lines

And for this part, i am a little confused :
1 clk_set_rate must be set even if format is wrong?
2 The original code logic shows that If format is not correct, we will not set registers HDLCD_REG_PIXEL_FORMAT & HDLCD_REG_<color>_SELECT, will this bring in
any problems?
3 if 1 the rate must set & 2 registers above doesn`t matter, then maybe there is no need to disable pixel clock.
Am i misunderstanding

Quoted 9 lines

You are right, the pixel format check should not happen inside hdlcd_crtc_atomic_enable() hook, it should be moved into a separate function hdlcd_crtc_atomic_check() and that needs to be hooked into .atomic_check() for hdlcd_crtc_helper_funcs().

If you want to have another go I'll be happy to review and Ack your patch.

Best regards,
Liviu

Hi

Sure, i will check this and re-subbmit one patch.

Regards,
Bernard

Quoted 50 lines
Quoted 40 lines

Regards,
Bernard

Quoted 33 lines
Quoted 23 lines
drivers/gpu/drm/arm/hdlcd_crtc.c +7 -1
+		return err;
 
 	clk_set_rate(hdlcd->clk, m->crtc_clock * 1000);
+	return 0;
 }
 
 static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,
@@ -173,7 +174,11 @@ static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,
 	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
 
 	clk_prepare_enable(hdlcd->clk);
-	hdlcd_crtc_mode_set_nofb(crtc);
+	if (hdlcd_crtc_mode_set_nofb(crtc)) {
+		DRM_DEBUG_KMS("Invalid format, pixel clock enable failed!\n");
+		clk_disable_unprepare(hdlcd->clk);
+		return;
+	}
 	hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1);
 	drm_crtc_vblank_on(crtc);
 }
Signature · 1 line
2.26.2
Signature · 8 lines
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
\ source code!  /
 ---------------
   ¯\_(ツ)_/¯
Signature · 8 lines
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
\ source code!  /
 ---------------
   ¯\_(ツ)_/¯