The v3s mixer config definition is a bit messy. Tidy it up.
No function change is intended.

Signed-off-by: Paul Kocialkowski <paulk@sys-base.io>
---
 drivers/gpu/drm/sun4i/sun8i_mixer.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index 8b41d33baa30..674b55f218fc 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -670,12 +670,12 @@ static const struct sun8i_mixer_cfg sun8i_r40_mixer1_cfg = {
 };
 
 static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
-	.vi_num = 2,
-	.ui_num = 1,
-	.scaler_mask = 0x3,
-	.scanline_yuv = 2048,
-	.ccsc = CCSC_MIXER0_LAYOUT,
-	.mod_rate = 150000000,
+	.ccsc		= CCSC_MIXER0_LAYOUT,
+	.mod_rate	= 150000000,
+	.scaler_mask	= 0x3,
+	.scanline_yuv	= 2048,
+	.ui_num		= 1,
+	.vi_num		= 2,
 };
 
 static const struct sun8i_mixer_cfg sun20i_d1_mixer0_cfg = {
-- 
2.49.0

Hi,

On Fri 04 Jul 25, 17:41, Paul Kocialkowski wrote:
> The v3s mixer config definition is a bit messy. Tidy it up.
> No function change is intended.

This patch didn't make it in the previous cycle.
Would it be possible to pick it up this time?

Thanks!

Paul

> Signed-off-by: Paul Kocialkowski <paulk@sys-base.io>
> ---
>  drivers/gpu/drm/sun4i/sun8i_mixer.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
> index 8b41d33baa30..674b55f218fc 100644
> --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
> +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
> @@ -670,12 +670,12 @@ static const struct sun8i_mixer_cfg sun8i_r40_mixer1_cfg = {
>  };
>  
>  static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
> -	.vi_num = 2,
> -	.ui_num = 1,
> -	.scaler_mask = 0x3,
> -	.scanline_yuv = 2048,
> -	.ccsc = CCSC_MIXER0_LAYOUT,
> -	.mod_rate = 150000000,
> +	.ccsc		= CCSC_MIXER0_LAYOUT,
> +	.mod_rate	= 150000000,
> +	.scaler_mask	= 0x3,
> +	.scanline_yuv	= 2048,
> +	.ui_num		= 1,
> +	.vi_num		= 2,
>  };
>  
>  static const struct sun8i_mixer_cfg sun20i_d1_mixer0_cfg = {
> -- 
> 2.49.0
> 

-- 
Paul Kocialkowski,

Independent contractor - sys-base - https://www.sys-base.io/
Free software developer - https://www.paulk.fr/

Expert in multimedia, graphics and embedded hardware support with Linux.

On Fri, Aug 22, 2025 at 6:24 PM Paul Kocialkowski <paulk@sys-base.io> wrote:
>
> Hi,
>
> On Fri 04 Jul 25, 17:41, Paul Kocialkowski wrote:
> > The v3s mixer config definition is a bit messy. Tidy it up.
> > No function change is intended.
>
> This patch didn't make it in the previous cycle.
> Would it be possible to pick it up this time?

I guess this is going to conflict with Jernej's refactoring / cleanup
series.

And, I think v3s is not the only one that has fields in a different order.
Might we clean this up after all the refactoring?


ChenYu

Hi Chen-Yu,

Le Thu 06 Nov 25, 14:01, Chen-Yu Tsai a écrit :
> On Fri, Aug 22, 2025 at 6:24 PM Paul Kocialkowski <paulk@sys-base.io> wrote:
> >
> > Hi,
> >
> > On Fri 04 Jul 25, 17:41, Paul Kocialkowski wrote:
> > > The v3s mixer config definition is a bit messy. Tidy it up.
> > > No function change is intended.
> >
> > This patch didn't make it in the previous cycle.
> > Would it be possible to pick it up this time?
> 
> I guess this is going to conflict with Jernej's refactoring / cleanup
> series.
> 
> And, I think v3s is not the only one that has fields in a different order.
> Might we clean this up after all the refactoring?

Sure, it's better if this doesn't get in the way of the rework.
I'll send something after the rework is merged if the issue still exists.

Thanks,

Paul

-- 
Paul Kocialkowski,

Independent contractor - sys-base - https://www.sys-base.io/
Free software developer - https://www.paulk.fr/

Expert in multimedia, graphics and embedded hardware support with Linux.