Skip to contentSkip to conversation

drm/sun4i: mixer: fix scanline for V3s and D1

PATCH In review Genfu Pan 4 participants 8 messages May 21, 2022 – May 24, 2022

Subsystems (5)
lore
Share & tools
lore

Genfu Pan

author
#0 lore raw

PATCH 1/1 drm/sun4i: mixer: fix scanline for V3s and D1

Accrording the SDK from Allwinner, the scanline value of yuv and rgb for V3s are both 1024. The is also the same for mixer 1 of D1. Currently the scanline value of rgb is hardcoded to 2048 for all SOCs.

Change the scanline_yuv property of V3s to 1024. Add the scanline_rgb property to the mixer config and replace the hardcoded value with it before scaling.

---
 drivers/gpu/drm/sun4i/sun8i_mixer.c    | 13 ++++++++++++-
 drivers/gpu/drm/sun4i/sun8i_mixer.h    |  1 +
 drivers/gpu/drm/sun4i/sun8i_vi_layer.c |  3 +--
 3 files changed, 14 insertions(+), 3 deletions(-)
drivers/gpu/drm/sun4i/sun8i_mixer.c +12 -1
index 875a1156c..e64e08207 100644
@@ -567,6 +567,7 @@ static const struct sun8i_mixer_cfg sun8i_a83t_mixer0_cfg = {
 	.ccsc		= CCSC_MIXER0_LAYOUT,
 	.scaler_mask	= 0xf,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 3,
 	.vi_num		= 1,
 };
@@ -575,6 +576,7 @@ static const struct sun8i_mixer_cfg sun8i_a83t_mixer1_cfg = {
 	.ccsc		= CCSC_MIXER1_LAYOUT,
 	.scaler_mask	= 0x3,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 1,
 	.vi_num		= 1,
 };
@@ -584,6 +586,7 @@ static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = {
 	.mod_rate	= 432000000,
 	.scaler_mask	= 0xf,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 3,
 	.vi_num		= 1,
 };
@@ -593,6 +596,7 @@ static const struct sun8i_mixer_cfg sun8i_r40_mixer0_cfg = {
 	.mod_rate	= 297000000,
 	.scaler_mask	= 0xf,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 3,
 	.vi_num		= 1,
 };
@@ -602,6 +606,7 @@ static const struct sun8i_mixer_cfg sun8i_r40_mixer1_cfg = {
 	.mod_rate	= 297000000,
 	.scaler_mask	= 0x3,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 1,
 	.vi_num		= 1,
 };
@@ -610,7 +615,8 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
 	.vi_num = 2,
 	.ui_num = 1,
 	.scaler_mask = 0x3,
-	.scanline_yuv = 2048,
+	.scanline_yuv = 1024,
+	.scanline_rgb = 1024,
 	.ccsc = CCSC_MIXER0_LAYOUT,
 	.mod_rate = 150000000,
 };
@@ -620,6 +626,7 @@ static const struct sun8i_mixer_cfg sun20i_d1_mixer0_cfg = {
 	.mod_rate	= 297000000,
 	.scaler_mask	= 0x3,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 1,
 	.vi_num		= 1,
 };
@@ -629,6 +636,7 @@ static const struct sun8i_mixer_cfg sun20i_d1_mixer1_cfg = {
 	.mod_rate	= 297000000,
 	.scaler_mask	= 0x1,
 	.scanline_yuv	= 1024,
+	.scanline_rgb	= 1024,
 	.ui_num		= 0,
 	.vi_num		= 1,
 };
@@ -638,6 +646,7 @@ static const struct sun8i_mixer_cfg sun50i_a64_mixer0_cfg = {
 	.mod_rate	= 297000000,
 	.scaler_mask	= 0xf,
 	.scanline_yuv	= 4096,
+	.scanline_rgb	= 2048,
 	.ui_num		= 3,
 	.vi_num		= 1,
 };
@@ -647,6 +656,7 @@ static const struct sun8i_mixer_cfg sun50i_a64_mixer1_cfg = {
 	.mod_rate	= 297000000,
 	.scaler_mask	= 0x3,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 1,
 	.vi_num		= 1,
 };
@@ -657,6 +667,7 @@ static const struct sun8i_mixer_cfg sun50i_h6_mixer0_cfg = {
 	.mod_rate	= 600000000,
 	.scaler_mask	= 0xf,
 	.scanline_yuv	= 4096,
+	.scanline_rgb	= 2048,
 	.ui_num		= 3,
 	.vi_num		= 1,
 };
drivers/gpu/drm/sun4i/sun8i_mixer.h +1 -0
index 85c94884f..c01b3e9d6 100644
@@ -172,6 +172,7 @@ struct sun8i_mixer_cfg {
 	unsigned long	mod_rate;
 	unsigned int	is_de3 : 1;
 	unsigned int	scanline_yuv;
+	unsigned int	scanline_rgb;
 };
 
 struct sun8i_mixer {
drivers/gpu/drm/sun4i/sun8i_vi_layer.c +1 -2
index f7d0b082d..30e6bde92 100644
@@ -188,8 +188,7 @@ static int sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel,
 			src_h = vn;
 		}
 
-		/* it seems that every RGB scaler has buffer for 2048 pixels */
-		scanline = subsampled ? mixer->cfg->scanline_yuv : 2048;
+		scanline = subsampled ? mixer->cfg->scanline_yuv : mixer->cfg->scanline_rgb;
 
 		if (src_w > scanline) {
 			DRM_DEBUG_DRIVER("Using horizontal coarse scaling\n");
Signature · 1 line
2.36.0
maintainer
#1 lore raw

Hi!

Dne sobota, 21. maj 2022 ob 15:34:43 CEST je Genfu Pan napisal(a):

Quoted 2 lines

Accrording the SDK from Allwinner, the scanline value of yuv and rgb for V3s are both 1024.

s/scanline value/scanline length/

Which SDK? All SDKs that I have or found on internet don't mention YUV nor RGB scanline limit. That doesn't mean there is none, I'm just unable to verify your claim. Did you test this by yourself? Also, please make YUV scanline change separate patch with fixes tag.

Quoted 6 lines

The is also the same for mixer 1 of D1. Currently the scanline value of rgb is hardcoded to 2048 for all SOCs.

Change the scanline_yuv property of V3s to 1024. > Add the scanline_rgb property to the mixer config and replace the hardcoded value with it before scaling.

I guess RGB scanline patch would also need fixes tag, since it fixes existing bug.

Quoted 107 lines
---
 drivers/gpu/drm/sun4i/sun8i_mixer.c    | 13 ++++++++++++-
 drivers/gpu/drm/sun4i/sun8i_mixer.h    |  1 +
 drivers/gpu/drm/sun4i/sun8i_vi_layer.c |  3 +--
 3 files changed, 14 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/sun4i/sun8i_mixer.c index 875a1156c..e64e08207 100644

drivers/gpu/drm/sun4i/sun8i_mixer.c +12 -1
@@ -567,6 +567,7 @@ static const struct sun8i_mixer_cfg
 sun8i_a83t_mixer0_cfg = { .ccsc		= CCSC_MIXER0_LAYOUT,
 	.scaler_mask	= 0xf,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 3,
 	.vi_num		= 1,
 };
@@ -575,6 +576,7 @@ static const struct sun8i_mixer_cfg
 sun8i_a83t_mixer1_cfg = { .ccsc		= CCSC_MIXER1_LAYOUT,
 	.scaler_mask	= 0x3,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 1,
 	.vi_num		= 1,
 };
@@ -584,6 +586,7 @@ static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg
 = { .mod_rate	= 432000000,
 	.scaler_mask	= 0xf,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 3,
 	.vi_num		= 1,
 };
@@ -593,6 +596,7 @@ static const struct sun8i_mixer_cfg sun8i_r40_mixer0_cfg
 = { .mod_rate	= 297000000,
 	.scaler_mask	= 0xf,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 3,
 	.vi_num		= 1,
 };
@@ -602,6 +606,7 @@ static const struct sun8i_mixer_cfg sun8i_r40_mixer1_cfg
 = { .mod_rate	= 297000000,
 	.scaler_mask	= 0x3,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 1,
 	.vi_num		= 1,
 };
@@ -610,7 +615,8 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg
 = { .vi_num = 2,
 	.ui_num = 1,
 	.scaler_mask = 0x3,
-	.scanline_yuv = 2048,
+	.scanline_yuv = 1024,
+	.scanline_rgb = 1024,
 	.ccsc = CCSC_MIXER0_LAYOUT,
 	.mod_rate = 150000000,
 };
@@ -620,6 +626,7 @@ static const struct sun8i_mixer_cfg sun20i_d1_mixer0_cfg
 = { .mod_rate	= 297000000,
 	.scaler_mask	= 0x3,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 1,
 	.vi_num		= 1,
 };
@@ -629,6 +636,7 @@ static const struct sun8i_mixer_cfg sun20i_d1_mixer1_cfg
 = { .mod_rate	= 297000000,
 	.scaler_mask	= 0x1,
 	.scanline_yuv	= 1024,
+	.scanline_rgb	= 1024,
 	.ui_num		= 0,
 	.vi_num		= 1,
 };
@@ -638,6 +646,7 @@ static const struct sun8i_mixer_cfg
 sun50i_a64_mixer0_cfg = { .mod_rate	= 297000000,
 	.scaler_mask	= 0xf,
 	.scanline_yuv	= 4096,
+	.scanline_rgb	= 2048,
 	.ui_num		= 3,
 	.vi_num		= 1,
 };
@@ -647,6 +656,7 @@ static const struct sun8i_mixer_cfg
 sun50i_a64_mixer1_cfg = { .mod_rate	= 297000000,
 	.scaler_mask	= 0x3,
 	.scanline_yuv	= 2048,
+	.scanline_rgb	= 2048,
 	.ui_num		= 1,
 	.vi_num		= 1,
 };
@@ -657,6 +667,7 @@ static const struct sun8i_mixer_cfg sun50i_h6_mixer0_cfg
 = { .mod_rate	= 600000000,
 	.scaler_mask	= 0xf,
 	.scanline_yuv	= 4096,
+	.scanline_rgb	= 2048,
 	.ui_num		= 3,
 	.vi_num		= 1,
 };
(quoted diff) +0 -0

b/drivers/gpu/drm/sun4i/sun8i_mixer.h index 85c94884f..c01b3e9d6 100644

drivers/gpu/drm/sun4i/sun8i_mixer.h struct sun8i_mixer_cfg { · line 175

Quoted 4 lines
drivers/gpu/drm/sun4i/sun8i_mixer.h +1 -0
@@ -172,6 +172,7 @@ struct sun8i_mixer_cfg {
 	unsigned long	mod_rate;
 	unsigned int	is_de3 : 1;
 	unsigned int	scanline_yuv;
+	unsigned int	scanline_rgb;

This quirk needs to be documented above in the comment.

Best regards,
Jernej

drivers/gpu/drm/sun4i/sun8i_vi_layer.c static int sun8i_vi_layer_update_coord(struct · line 191

Quoted 12 lines
drivers/gpu/drm/sun4i/sun8i_mixer.h +0 -0
 };
 
 struct sun8i_mixer {
(quoted diff) +0 -0

b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c index f7d0b082d..30e6bde92 100644

drivers/gpu/drm/sun4i/sun8i_vi_layer.c +0 -1
@@ -188,8 +188,7 @@ static int sun8i_vi_layer_update_coord(struct
 sun8i_mixer *mixer, int channel, src_h = vn;
 		}
 
-		/* it seems that every RGB scaler has buffer for 2048 

pixels */

drivers/gpu/drm/sun4i/sun8i_vi_layer.c static int sun8i_vi_layer_update_coord(struct · line 192

Quoted 1 line
drivers/gpu/drm/sun4i/sun8i_vi_layer.c +0 -1
-		scanline = subsampled ? mixer->cfg->scanline_yuv : 

2048;

Quoted 5 lines
drivers/gpu/drm/sun4i/sun8i_vi_layer.c +1 -0
+		scanline = subsampled ? mixer->cfg->scanline_yuv :
 mixer->cfg->scanline_rgb;
 
 		if (src_w > scanline) {

DRM_DEBUG_DRIVER("Using horizontal coarse

scaling\n");

#2 lore raw

Hi Jernej!

Quoted 4 lines

Which SDK? All SDKs that I have or found on internet don't mention YUV nor RGB scanline limit. That doesn't mean there is none, I'm just unable to verify your claim. Did you test this by yourself? Also, please make YUV scanline change separate patch with fixes tag.

Here is the code about scanline config for V3s:
https://github.com/Tina-Linux/tina-v3s-linux-4.9/blob/master/drivers/video/fbdev/sunxi/disp2/disp/de/lowlevel_sun8iw8/de_feat.c#L55
https://github.com/Tina-Linux/tina-v3s-linux-4.9/blob/master/drivers/video/fbdev/sunxi/disp2/disp/de/lowlevel_sun8iw8/de_rtmx.c#L1212

And here is for D1:
https://gitlab.com/weidongshan/tina-d1-h/-/blob/main/lichee/linux-5.4/drivers/video/fbdev/sunxi/disp2/disp/de/lowlevel_v2x/de_feat.c#L182
https://gitlab.com/weidongshan/tina-d1-h/-/blob/main/lichee/linux-5.4/drivers/video/fbdev/sunxi/disp2/disp/de/lowlevel_v2x/de_rtmx.c#L1588

I was tested it on V3s. Without this patch, the plane will not display correctly if src_w large than 1024, for both YUV and RGB. I don't have a device with D1, so D1 is not tested. But according to the SDK code of D1, the scanline value of mixer1 is 1024.

I'm new to submitting patches, So may I ask a question? If there is no problem with this patch, what I need to do is to send new patches as you suggested?

Best regards,
Genfu Pan

#3 lore raw
In reply to Jernej Škrabec

Hi Jernej!

Quoted 4 lines

Which SDK? All SDKs that I have or found on internet don't mention YUV nor RGB scanline limit. That doesn't mean there is none, I'm just unable to verify your claim. Did you test this by yourself? Also, please make YUV scanline change separate patch with fixes tag.

Here is the code about scanline config for V3s:
https://github.com/Tina-Linux/tina-v3s-linux-4.9/blob/master/drivers/video/fbdev/sunxi/disp2/disp/de/lowlevel_sun8iw8/de_feat.c#L55
https://github.com/Tina-Linux/tina-v3s-linux-4.9/blob/master/drivers/video/fbdev/sunxi/disp2/disp/de/lowlevel_sun8iw8/de_rtmx.c#L1212

And here is for D1:
https://gitlab.com/weidongshan/tina-d1-h/-/blob/main/lichee/linux-5.4/drivers/video/fbdev/sunxi/disp2/disp/de/lowlevel_v2x/de_feat.c#L182
https://gitlab.com/weidongshan/tina-d1-h/-/blob/main/lichee/linux-5.4/drivers/video/fbdev/sunxi/disp2/disp/de/lowlevel_v2x/de_rtmx.c#L1588

I was tested it on V3s. Without this patch, the plane will not display correctly if src_w large than 1024, for both YUV and RGB. I don't have a device with D1, so D1 is not tested. But according to the SDK code of D1, the scanline value of mixer1 is 1024.

I'm new to submitting patches, So may I ask a question? If there is no problem with this patch, what I need to do is to send new patches as you suggested?

Best regards,
Genfu Pan

#5 lore raw
In reply to Jernej Škrabec
Quoted 9 lines · 在 2022-05-22星期日的 10:36 +0200,Jernej Škrabec写道:

Hi!

Dne sobota, 21. maj 2022 ob 15:34:43 CEST je Genfu Pan napisal(a):

Quoted 3 lines

Accrording the SDK from Allwinner, the scanline value of yuv and rgb for
V3s are both 1024.

s/scanline value/scanline length/

Quoted 7 lines

Which SDK? All SDKs that I have or found on internet don't mention YUV nor RGB
scanline limit. That doesn't mean there is none, I'm just unable to verify
your claim. Did you test this by yourself? Also, please make YUV scanline
change separate patch with fixes tag.

BTW I think chip manuals all say that the chip supports NxN resolution in DE2 chapter, e.g. the V3 datasheet says DE2 "Output size up to 1024x1024".

However there's no information about D1's second mixer.

Quoted 168 lines
Quoted 9 lines

The is also the same for mixer 1 of D1. Currently the scanline value of rgb is hardcoded to 2048 for all SOCs.

Change the scanline_yuv property of V3s to 1024. > Add the scanline_rgb
property to the mixer config and replace the hardcoded value with it before
scaling.

I guess RGB scanline patch would also need fixes tag, since it fixes existing
bug.

Quoted 116 lines

---
 drivers/gpu/drm/sun4i/sun8i_mixer.c    | 13 ++++++++++++- drivers/gpu/drm/sun4i/sun8i_mixer.h    |  1 + drivers/gpu/drm/sun4i/sun8i_vi_layer.c |  3 +--

 3 files changed, 14 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/sun4i/sun8i_mixer.c index 875a1156c..e64e08207 100644

drivers/gpu/drm/sun4i/sun8i_mixer.c +2 -0
@@ -567,6 +567,7 @@ static const struct sun8i_mixer_cfg
 sun8i_a83t_mixer0_cfg = { .ccsc         = CCSC_MIXER0_LAYOUT,
         .scaler_mask    = 0xf,
         .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
         .ui_num         = 3,
         .vi_num         = 1,
  };
@@ -575,6 +576,7 @@ static const struct sun8i_mixer_cfg
 sun8i_a83t_mixer1_cfg = { .ccsc         = CCSC_MIXER1_LAYOUT,
         .scaler_mask    = 0x3,
         .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
         .ui_num         = 1,
         .vi_num         = 1,
  };
@@ -584,6 +586,7 @@ static const struct sun8i_mixer_cfg

sun8i_h3_mixer0_cfg
= { .mod_rate   = 432000000,
        .scaler_mask    = 0xf,
        .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
        .ui_num         = 3,
        .vi_num         = 1,
 };

drivers/gpu/drm/sun4i/sun8i_mixer.c +0 -0
@@ -593,6 +596,7 @@ static const struct sun8i_mixer_cfg

sun8i_r40_mixer0_cfg
= { .mod_rate   = 297000000,
        .scaler_mask    = 0xf,
        .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
        .ui_num         = 3,
        .vi_num         = 1,
 };

drivers/gpu/drm/sun4i/sun8i_mixer.c +0 -0
@@ -602,6 +606,7 @@ static const struct sun8i_mixer_cfg

sun8i_r40_mixer1_cfg
= { .mod_rate   = 297000000,
        .scaler_mask    = 0x3,
        .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
        .ui_num         = 1,
        .vi_num         = 1,
 };

drivers/gpu/drm/sun4i/sun8i_mixer.c +0 -0
@@ -610,7 +615,8 @@ static const struct sun8i_mixer_cfg

sun8i_v3s_mixer_cfg
= { .vi_num = 2,
        .ui_num = 1,
        .scaler_mask = 0x3,
-       .scanline_yuv = 2048,
+       .scanline_yuv = 1024,
+       .scanline_rgb = 1024,
        .ccsc = CCSC_MIXER0_LAYOUT,
        .mod_rate = 150000000,
 };

drivers/gpu/drm/sun4i/sun8i_mixer.c +0 -0
@@ -620,6 +626,7 @@ static const struct sun8i_mixer_cfg

sun20i_d1_mixer0_cfg
= { .mod_rate   = 297000000,
        .scaler_mask    = 0x3,
        .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
        .ui_num         = 1,
        .vi_num         = 1,
 };

drivers/gpu/drm/sun4i/sun8i_mixer.c +0 -0
@@ -629,6 +636,7 @@ static const struct sun8i_mixer_cfg

sun20i_d1_mixer1_cfg
= { .mod_rate   = 297000000,
        .scaler_mask    = 0x1,
        .scanline_yuv   = 1024,
+       .scanline_rgb   = 1024,
        .ui_num         = 0,
        .vi_num         = 1,
 };

drivers/gpu/drm/sun4i/sun8i_mixer.c +2 -0
@@ -638,6 +646,7 @@ static const struct sun8i_mixer_cfg
 sun50i_a64_mixer0_cfg = { .mod_rate     = 297000000,
         .scaler_mask    = 0xf,
         .scanline_yuv   = 4096,
+       .scanline_rgb   = 2048,
         .ui_num         = 3,
         .vi_num         = 1,
  };
@@ -647,6 +656,7 @@ static const struct sun8i_mixer_cfg
 sun50i_a64_mixer1_cfg = { .mod_rate     = 297000000,
         .scaler_mask    = 0x3,
         .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
         .ui_num         = 1,
         .vi_num         = 1,
  };
@@ -657,6 +667,7 @@ static const struct sun8i_mixer_cfg

sun50i_h6_mixer0_cfg
= { .mod_rate   = 600000000,
        .scaler_mask    = 0xf,
        .scanline_yuv   = 4096,
+       .scanline_rgb   = 2048,
        .ui_num         = 3,
        .vi_num         = 1,
 };

(quoted diff) +0 -0

b/drivers/gpu/drm/sun4i/sun8i_mixer.h index 85c94884f..c01b3e9d6 100644

drivers/gpu/drm/sun4i/sun8i_mixer.h struct sun8i_mixer_cfg { · line 175

Quoted 4 lines
drivers/gpu/drm/sun4i/sun8i_mixer.h +1 -0
@@ -172,6 +172,7 @@ struct sun8i_mixer_cfg {
         unsigned long   mod_rate;
         unsigned int    is_de3 : 1;
         unsigned int    scanline_yuv;
+       unsigned int    scanline_rgb;

This quirk needs to be documented above in the comment.

Best regards,
Jernej

Quoted 13 lines
drivers/gpu/drm/sun4i/sun8i_mixer.h +0 -0
  };
 
  struct sun8i_mixer {
(quoted diff) +0 -0

b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c index f7d0b082d..30e6bde92 100644

drivers/gpu/drm/sun4i/sun8i_vi_layer.c +0 -1
@@ -188,8 +188,7 @@ static int sun8i_vi_layer_update_coord(struct
 sun8i_mixer *mixer, int channel, src_h = vn;
                 }
 
-               /* it seems that every RGB scaler has buffer for
Quoted 1 line

2048

pixels */

Quoted 1 line

-               scanline = subsampled ? mixer->cfg->scanline_yuv :

2048;

Quoted 5 lines

+               scanline = subsampled ? mixer->cfg->scanline_yuv :
mixer->cfg->scanline_rgb;

                if (src_w > scanline) { DRM_DEBUG_DRIVER("Using horizontal coarse

scaling\n");

maintainer
#6 lore raw
Quoted 18 lines · Icenowy Zheng
Quoted 9 lines · 在 2022-05-22星期日的 10:36 +0200,Jernej Škrabec写道:

Hi!

Dne sobota, 21. maj 2022 ob 15:34:43 CEST je Genfu Pan napisal(a):

Quoted 3 lines

Accrording the SDK from Allwinner, the scanline value of yuv and rgb for
V3s are both 1024.

s/scanline value/scanline length/

Quoted 7 lines

Which SDK? All SDKs that I have or found on internet don't mention YUV nor RGB
scanline limit. That doesn't mean there is none, I'm just unable to verify
your claim. Did you test this by yourself? Also, please make YUV scanline
change separate patch with fixes tag.

Quoted 5 lines

BTW I think chip manuals all say that the chip supports NxN resolution in DE2 chapter, e.g. the V3 datasheet says DE2 "Output size up to 1024x1024".

However there's no information about D1's second mixer.

My information comes from the BSP driver[0]:

static const int sun8iw20_de_scale_line_buffer[] = {
        /* DISP0 */
        2048,
        /* DISP1 */
        1024,
};

It looks like the value returned from de_feat_get_scale_linebuf() may be used for RGB as well, if scaling is enabled. This appears to be the "format == 3" case in de_rtmx_get_coarse_fac[1]. On the other hand, the code for V3 has specific code for the RGB limit[2].

Is there some test I can do on D1 to see what the right value for RGB is?

Regards,
Samuel

[0]:
https://github.com/Tina-Linux/tina-d1x-linux-5.4/blob/master/drivers/video/fbdev/sunxi/disp2/disp/de/lowlevel_v2x/de_feat.c#L182
[1]:
https://github.com/Tina-Linux/tina-d1x-linux-5.4/blob/master/drivers/video/fbdev/sunxi/disp2/disp/de/lowlevel_v2x/de_rtmx.c#L1588
[2]:
https://github.com/Tina-Linux/tina-d1x-linux-5.4/blob/master/drivers/video/fbdev/sunxi/disp2/disp/de/lowlevel_sun8iw8/de_rtmx.c#L1211

Quoted 169 lines
Quoted 167 lines
Quoted 8 lines

The is also the same for mixer 1 of D1. Currently the scanline value of rgb is hardcoded to 2048 for all SOCs.

Change the scanline_yuv property of V3s to 1024. > Add the scanline_rgb
property to the mixer config and replace the hardcoded value with it before
scaling.

I guess RGB scanline patch would also need fixes tag, since it fixes existing
bug.

Quoted 116 lines

---
 drivers/gpu/drm/sun4i/sun8i_mixer.c    | 13 ++++++++++++- drivers/gpu/drm/sun4i/sun8i_mixer.h    |  1 + drivers/gpu/drm/sun4i/sun8i_vi_layer.c |  3 +--

 3 files changed, 14 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/sun4i/sun8i_mixer.c index 875a1156c..e64e08207 100644

drivers/gpu/drm/sun4i/sun8i_mixer.c +2 -0
@@ -567,6 +567,7 @@ static const struct sun8i_mixer_cfg
 sun8i_a83t_mixer0_cfg = { .ccsc         = CCSC_MIXER0_LAYOUT,
         .scaler_mask    = 0xf,
         .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
         .ui_num         = 3,
         .vi_num         = 1,
  };
@@ -575,6 +576,7 @@ static const struct sun8i_mixer_cfg
 sun8i_a83t_mixer1_cfg = { .ccsc         = CCSC_MIXER1_LAYOUT,
         .scaler_mask    = 0x3,
         .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
         .ui_num         = 1,
         .vi_num         = 1,
  };
@@ -584,6 +586,7 @@ static const struct sun8i_mixer_cfg

sun8i_h3_mixer0_cfg
= { .mod_rate   = 432000000,
        .scaler_mask    = 0xf,
        .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
        .ui_num         = 3,
        .vi_num         = 1,
 };

drivers/gpu/drm/sun4i/sun8i_mixer.c +0 -0
@@ -593,6 +596,7 @@ static const struct sun8i_mixer_cfg

sun8i_r40_mixer0_cfg
= { .mod_rate   = 297000000,
        .scaler_mask    = 0xf,
        .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
        .ui_num         = 3,
        .vi_num         = 1,
 };

drivers/gpu/drm/sun4i/sun8i_mixer.c +0 -0
@@ -602,6 +606,7 @@ static const struct sun8i_mixer_cfg

sun8i_r40_mixer1_cfg
= { .mod_rate   = 297000000,
        .scaler_mask    = 0x3,
        .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
        .ui_num         = 1,
        .vi_num         = 1,
 };

drivers/gpu/drm/sun4i/sun8i_mixer.c +0 -0
@@ -610,7 +615,8 @@ static const struct sun8i_mixer_cfg

sun8i_v3s_mixer_cfg
= { .vi_num = 2,
        .ui_num = 1,
        .scaler_mask = 0x3,
-       .scanline_yuv = 2048,
+       .scanline_yuv = 1024,
+       .scanline_rgb = 1024,
        .ccsc = CCSC_MIXER0_LAYOUT,
        .mod_rate = 150000000,
 };

drivers/gpu/drm/sun4i/sun8i_mixer.c +0 -0
@@ -620,6 +626,7 @@ static const struct sun8i_mixer_cfg

sun20i_d1_mixer0_cfg
= { .mod_rate   = 297000000,
        .scaler_mask    = 0x3,
        .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
        .ui_num         = 1,
        .vi_num         = 1,
 };

drivers/gpu/drm/sun4i/sun8i_mixer.c +0 -0
@@ -629,6 +636,7 @@ static const struct sun8i_mixer_cfg

sun20i_d1_mixer1_cfg
= { .mod_rate   = 297000000,
        .scaler_mask    = 0x1,
        .scanline_yuv   = 1024,
+       .scanline_rgb   = 1024,
        .ui_num         = 0,
        .vi_num         = 1,
 };

drivers/gpu/drm/sun4i/sun8i_mixer.c +2 -0
@@ -638,6 +646,7 @@ static const struct sun8i_mixer_cfg
 sun50i_a64_mixer0_cfg = { .mod_rate     = 297000000,
         .scaler_mask    = 0xf,
         .scanline_yuv   = 4096,
+       .scanline_rgb   = 2048,
         .ui_num         = 3,
         .vi_num         = 1,
  };
@@ -647,6 +656,7 @@ static const struct sun8i_mixer_cfg
 sun50i_a64_mixer1_cfg = { .mod_rate     = 297000000,
         .scaler_mask    = 0x3,
         .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
         .ui_num         = 1,
         .vi_num         = 1,
  };
@@ -657,6 +667,7 @@ static const struct sun8i_mixer_cfg

sun50i_h6_mixer0_cfg
= { .mod_rate   = 600000000,
        .scaler_mask    = 0xf,
        .scanline_yuv   = 4096,
+       .scanline_rgb   = 2048,
        .ui_num         = 3,
        .vi_num         = 1,
 };

(quoted diff) +0 -0

b/drivers/gpu/drm/sun4i/sun8i_mixer.h index 85c94884f..c01b3e9d6 100644

drivers/gpu/drm/sun4i/sun8i_mixer.h struct sun8i_mixer_cfg { · line 175

Quoted 4 lines
drivers/gpu/drm/sun4i/sun8i_mixer.h +1 -0
@@ -172,6 +172,7 @@ struct sun8i_mixer_cfg {
         unsigned long   mod_rate;
         unsigned int    is_de3 : 1;
         unsigned int    scanline_yuv;
+       unsigned int    scanline_rgb;

This quirk needs to be documented above in the comment.

Best regards,
Jernej

Quoted 13 lines
drivers/gpu/drm/sun4i/sun8i_mixer.h +0 -0
  };
 
  struct sun8i_mixer {
(quoted diff) +0 -0

b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c index f7d0b082d..30e6bde92 100644

drivers/gpu/drm/sun4i/sun8i_vi_layer.c +0 -1
@@ -188,8 +188,7 @@ static int sun8i_vi_layer_update_coord(struct
 sun8i_mixer *mixer, int channel, src_h = vn;
                 }
 
-               /* it seems that every RGB scaler has buffer for
Quoted 1 line

2048

pixels */

Quoted 1 line

-               scanline = subsampled ? mixer->cfg->scanline_yuv :

2048;

Quoted 5 lines

+               scanline = subsampled ? mixer->cfg->scanline_yuv :
mixer->cfg->scanline_rgb;

                if (src_w > scanline) { DRM_DEBUG_DRIVER("Using horizontal coarse

scaling\n");

maintainer
#7 lore raw

Dne torek, 24. maj 2022 ob 19:07:27 CEST je Samuel Holland napisal(a):

Quoted 27 lines · Icenowy Zheng
Quoted 18 lines · 在 2022-05-22星期日的 10:36 +0200,Jernej Škrabec写道:
Quoted 9 lines

Hi!

Dne sobota, 21. maj 2022 ob 15:34:43 CEST je Genfu Pan napisal(a):

Quoted 3 lines

Accrording the SDK from Allwinner, the scanline value of yuv and rgb for
V3s are both 1024.

s/scanline value/scanline length/

Quoted 7 lines

Which SDK? All SDKs that I have or found on internet don't mention YUV nor RGB
scanline limit. That doesn't mean there is none, I'm just unable to verify
your claim. Did you test this by yourself? Also, please make YUV scanline
change separate patch with fixes tag.

Quoted 5 lines

BTW I think chip manuals all say that the chip supports NxN resolution in DE2 chapter, e.g. the V3 datasheet says DE2 "Output size up to 1024x1024".

However there's no information about D1's second mixer.

My information comes from the BSP driver[0]:

Quoted 8 lines
static const int sun8iw20_de_scale_line_buffer[] = {
        /* DISP0 */
        2048,
        /* DISP1 */
        1024,
};

It looks like the value returned from de_feat_get_scale_linebuf() may be

used

Quoted 5 lines

for RGB as well, if scaling is enabled. This appears to be the "format == 3" case in de_rtmx_get_coarse_fac[1]. On the other hand, the code for V3 has specific code for the RGB limit[2].

Is there some test I can do on D1 to see what the right value for RGB is?

I use modetest for such tests. It's part of libdrm. In general, you want to make plane wider than scanline and then scale it down. Obviously you want to test this once with RGB and once with YUV format. This is all done with "modetest -P".

Best regards,
Jernej

Quoted 6 lines

Regards,
Samuel

[0]:
https://github.com/Tina-Linux/tina-d1x-linux-5.4/blob/master/drivers/video/

fbdev/sunxi/disp2/disp/de/lowlevel_v2x/de_feat.c#L182

Quoted 2 lines

[1]:
https://github.com/Tina-Linux/tina-d1x-linux-5.4/blob/master/drivers/video/

fbdev/sunxi/disp2/disp/de/lowlevel_v2x/de_rtmx.c#L1588

Quoted 2 lines

[2]:
https://github.com/Tina-Linux/tina-d1x-linux-5.4/blob/master/drivers/video/

fbdev/sunxi/disp2/disp/de/lowlevel_sun8iw8/de_rtmx.c#L1211

Quoted 172 lines
Quoted 170 lines
Quoted 168 lines
Quoted 9 lines

The is also the same for mixer 1 of D1. Currently the scanline value of rgb is hardcoded to 2048 for all SOCs.

Change the scanline_yuv property of V3s to 1024. > Add the scanline_rgb
property to the mixer config and replace the hardcoded value with it before
scaling.

I guess RGB scanline patch would also need fixes tag, since it fixes existing
bug.

Quoted 116 lines
---
 drivers/gpu/drm/sun4i/sun8i_mixer.c    | 13 ++++++++++++-
 drivers/gpu/drm/sun4i/sun8i_mixer.h    |  1 +
 drivers/gpu/drm/sun4i/sun8i_vi_layer.c |  3 +--
 3 files changed, 14 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/sun4i/sun8i_mixer.c index 875a1156c..e64e08207 100644

drivers/gpu/drm/sun4i/sun8i_mixer.c +2 -0
@@ -567,6 +567,7 @@ static const struct sun8i_mixer_cfg
 sun8i_a83t_mixer0_cfg = { .ccsc         = CCSC_MIXER0_LAYOUT,
        .scaler_mask    = 0xf,
        .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
        .ui_num         = 3,
        .vi_num         = 1,
 };
@@ -575,6 +576,7 @@ static const struct sun8i_mixer_cfg
 sun8i_a83t_mixer1_cfg = { .ccsc         = CCSC_MIXER1_LAYOUT,
        .scaler_mask    = 0x3,
        .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
        .ui_num         = 1,
        .vi_num         = 1,
 };
@@ -584,6 +586,7 @@ static const struct sun8i_mixer_cfg

sun8i_h3_mixer0_cfg
= { .mod_rate = 432000000,

        .scaler_mask    = 0xf,
        .scanline_yuv   = 2048,
drivers/gpu/drm/sun4i/sun8i_mixer.c +1 -0
+       .scanline_rgb   = 2048,
        .ui_num         = 3,
        .vi_num         = 1,
 };
@@ -593,6 +596,7 @@ static const struct sun8i_mixer_cfg

sun8i_r40_mixer0_cfg
= { .mod_rate = 297000000,

        .scaler_mask    = 0xf,
        .scanline_yuv   = 2048,
drivers/gpu/drm/sun4i/sun8i_mixer.c +1 -0
+       .scanline_rgb   = 2048,
        .ui_num         = 3,
        .vi_num         = 1,
 };
@@ -602,6 +606,7 @@ static const struct sun8i_mixer_cfg

sun8i_r40_mixer1_cfg
= { .mod_rate = 297000000,

        .scaler_mask    = 0x3,
        .scanline_yuv   = 2048,
drivers/gpu/drm/sun4i/sun8i_mixer.c +1 -0
+       .scanline_rgb   = 2048,
        .ui_num         = 1,
        .vi_num         = 1,
 };
@@ -610,7 +615,8 @@ static const struct sun8i_mixer_cfg

sun8i_v3s_mixer_cfg
= { .vi_num = 2,

        .ui_num = 1,
        .scaler_mask = 0x3,
drivers/gpu/drm/sun4i/sun8i_mixer.c +2 -1
-       .scanline_yuv = 2048,
+       .scanline_yuv = 1024,
+       .scanline_rgb = 1024,
        .ccsc = CCSC_MIXER0_LAYOUT,
        .mod_rate = 150000000,
 };
@@ -620,6 +626,7 @@ static const struct sun8i_mixer_cfg

sun20i_d1_mixer0_cfg
= { .mod_rate = 297000000,

        .scaler_mask    = 0x3,
        .scanline_yuv   = 2048,
drivers/gpu/drm/sun4i/sun8i_mixer.c +1 -0
+       .scanline_rgb   = 2048,
        .ui_num         = 1,
        .vi_num         = 1,
 };
@@ -629,6 +636,7 @@ static const struct sun8i_mixer_cfg

sun20i_d1_mixer1_cfg
= { .mod_rate = 297000000,

        .scaler_mask    = 0x1,
        .scanline_yuv   = 1024,
drivers/gpu/drm/sun4i/sun8i_mixer.c +3 -0
+       .scanline_rgb   = 1024,
        .ui_num         = 0,
        .vi_num         = 1,
 };
@@ -638,6 +646,7 @@ static const struct sun8i_mixer_cfg
 sun50i_a64_mixer0_cfg = { .mod_rate     = 297000000,
        .scaler_mask    = 0xf,
        .scanline_yuv   = 4096,
+       .scanline_rgb   = 2048,
        .ui_num         = 3,
        .vi_num         = 1,
 };
@@ -647,6 +656,7 @@ static const struct sun8i_mixer_cfg
 sun50i_a64_mixer1_cfg = { .mod_rate     = 297000000,
        .scaler_mask    = 0x3,
        .scanline_yuv   = 2048,
+       .scanline_rgb   = 2048,
        .ui_num         = 1,
        .vi_num         = 1,
 };
@@ -657,6 +667,7 @@ static const struct sun8i_mixer_cfg

sun50i_h6_mixer0_cfg
= { .mod_rate = 600000000,

        .scaler_mask    = 0xf,
        .scanline_yuv   = 4096,
drivers/gpu/drm/sun4i/sun8i_mixer.c +1 -0
+       .scanline_rgb   = 2048,
        .ui_num         = 3,
        .vi_num         = 1,
 };
(quoted diff) +0 -0

b/drivers/gpu/drm/sun4i/sun8i_mixer.h index 85c94884f..c01b3e9d6 100644

drivers/gpu/drm/sun4i/sun8i_mixer.h struct sun8i_mixer_cfg { · line 175

Quoted 4 lines
drivers/gpu/drm/sun4i/sun8i_mixer.h +1 -0
@@ -172,6 +172,7 @@ struct sun8i_mixer_cfg {
        unsigned long   mod_rate;
        unsigned int    is_de3 : 1;
        unsigned int    scanline_yuv;
+       unsigned int    scanline_rgb;

This quirk needs to be documented above in the comment.

Best regards,
Jernej

Quoted 13 lines
drivers/gpu/drm/sun4i/sun8i_mixer.h +0 -0
 };
 
 struct sun8i_mixer {
(quoted diff) +0 -0

b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c index f7d0b082d..30e6bde92 100644

drivers/gpu/drm/sun4i/sun8i_vi_layer.c +0 -1
@@ -188,8 +188,7 @@ static int sun8i_vi_layer_update_coord(struct
 sun8i_mixer *mixer, int channel, src_h = vn;
                }
 
-               /* it seems that every RGB scaler has buffer for
Quoted 1 line

2048

pixels */

Quoted 1 line

- scanline = subsampled ? mixer->cfg->scanline_yuv :

2048;

Quoted 5 lines

+ scanline = subsampled ? mixer->cfg->scanline_yuv :
mixer->cfg->scanline_rgb;

if (src_w > scanline) {
DRM_DEBUG_DRIVER("Using horizontal coarse

scaling\n");

maintainer
#4 lore raw
In reply to [email protected]

Dne nedelja, 22. maj 2022 ob 12:48:27 CEST je [email protected] napisal(a):

Quoted 3 lines

Hi Jernej!

Quoted 1 line

Which SDK? All SDKs that I have or found on internet don't mention YUV nor

RGB

Quoted 6 lines
Quoted 3 lines

scanline limit. That doesn't mean there is none, I'm just unable to verify your claim. Did you test this by yourself? Also, please make YUV scanline change separate patch with fixes tag.

Here is the code about scanline config for V3s:
https://github.com/Tina-Linux/tina-v3s-linux-4.9/blob/master/drivers/video/

fbdev/sunxi/disp2/disp/de/lowlevel_sun8iw8/de_feat.c#L55

Quoted 1 line

https://github.com/Tina-Linux/tina-v3s-linux-4.9/blob/master/drivers/video/

fbdev/sunxi/disp2/disp/de/lowlevel_sun8iw8/de_rtmx.c#L1212

Quoted 3 lines

And here is for D1:
https://gitlab.com/weidongshan/tina-d1-h/-/blob/main/lichee/linux-5.4/

drivers/video/fbdev/sunxi/disp2/disp/de/lowlevel_v2x/de_feat.c#L182

Quoted 1 line

https://gitlab.com/weidongshan/tina-d1-h/-/blob/main/lichee/linux-5.4/

drivers/video/fbdev/sunxi/disp2/disp/de/lowlevel_v2x/de_rtmx.c#L1588

Thanks for the links!

Quoted 9 lines

I was tested it on V3s. Without this patch, the plane will not display correctly if src_w large than 1024, for both YUV and RGB. I don't have a device with D1, so D1 is not tested. But according to the SDK code of D1, the scanline value of mixer1 is 1024.

I'm new to submitting patches, So may I ask a question? If there is no problem with this patch, what I need to do is to send new patches as you suggested?

https://www.kernel.org/doc/html/latest/process/submitting-patches.html

I already requested changes, so you need to send v2. But wait until discussion is finished.

Best regards,
Jernej

Quoted 5 lines

Best regards,
Genfu Pan