Re: [PATCH 1/2] drm/verisilicon: add primary modifier for format tables

[Icenowy Zheng <zhengxingda@iscas.ac.cn>]

在 2026-09-10四的 17:49 +0800，Icenowy Zheng写道：
> Currently the format tables are only used for the primary plane.
> 
> Add primary modifiers to names related to the tables.
> 
> Signed-off-by: Icenowy Zheng <zhengxingda@iscas.ac.cn>

Applied (the whole patchset) onto drm-misc-fixes.

Thanks,
Icenowy

> ---
>  drivers/gpu/drm/verisilicon/vs_hwdb.c          | 12 ++++++------
>  drivers/gpu/drm/verisilicon/vs_hwdb.h          |  4 ++--
>  drivers/gpu/drm/verisilicon/vs_primary_plane.c |  4 ++--
>  3 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/verisilicon/vs_hwdb.c
> b/drivers/gpu/drm/verisilicon/vs_hwdb.c
> index 2a0f7c59afa3a..56aa450443068 100644
> --- a/drivers/gpu/drm/verisilicon/vs_hwdb.c
> +++ b/drivers/gpu/drm/verisilicon/vs_hwdb.c
> @@ -10,7 +10,7 @@
>  #include "vs_dc_top_regs.h"
>  #include "vs_hwdb.h"
>  
> -static const u32 vs_formats_array_no_yuv444[] = {
> +static const u32 vs_primary_formats_array_no_yuv444[] = {
>  	DRM_FORMAT_XRGB4444,
>  	DRM_FORMAT_XBGR4444,
>  	DRM_FORMAT_RGBX4444,
> @@ -44,7 +44,7 @@ static const u32 vs_formats_array_no_yuv444[] = {
>  	/* TODO: non-RGB formats */
>  };
>  
> -static const u32 vs_formats_array_with_yuv444[] = {
> +static const u32 vs_primary_formats_array_with_yuv444[] = {
>  	DRM_FORMAT_XRGB4444,
>  	DRM_FORMAT_XBGR4444,
>  	DRM_FORMAT_RGBX4444,
> @@ -79,13 +79,13 @@ static const u32 vs_formats_array_with_yuv444[] =
> {
>  };
>  
>  static const struct vs_formats vs_formats_no_yuv444 = {
> -	.array = vs_formats_array_no_yuv444,
> -	.num = ARRAY_SIZE(vs_formats_array_no_yuv444)
> +	.primary_array = vs_primary_formats_array_no_yuv444,
> +	.primary_num =
> ARRAY_SIZE(vs_primary_formats_array_no_yuv444)
>  };
>  
>  static const struct vs_formats vs_formats_with_yuv444 = {
> -	.array = vs_formats_array_with_yuv444,
> -	.num = ARRAY_SIZE(vs_formats_array_with_yuv444)
> +	.primary_array = vs_primary_formats_array_with_yuv444,
> +	.primary_num =
> ARRAY_SIZE(vs_primary_formats_array_with_yuv444)
>  };
>  
>  static struct vs_chip_identity vs_chip_identities[] = {
> diff --git a/drivers/gpu/drm/verisilicon/vs_hwdb.h
> b/drivers/gpu/drm/verisilicon/vs_hwdb.h
> index 2065ecb730437..616076d931a57 100644
> --- a/drivers/gpu/drm/verisilicon/vs_hwdb.h
> +++ b/drivers/gpu/drm/verisilicon/vs_hwdb.h
> @@ -10,8 +10,8 @@
>  #include <linux/types.h>
>  
>  struct vs_formats {
> -	const u32 *array;
> -	unsigned int num;
> +	const u32 *primary_array;
> +	unsigned int primary_num;
>  };
>  
>  struct vs_chip_identity {
> diff --git a/drivers/gpu/drm/verisilicon/vs_primary_plane.c
> b/drivers/gpu/drm/verisilicon/vs_primary_plane.c
> index 1f2be41ae496c..8e94491693019 100644
> --- a/drivers/gpu/drm/verisilicon/vs_primary_plane.c
> +++ b/drivers/gpu/drm/verisilicon/vs_primary_plane.c
> @@ -168,8 +168,8 @@ struct drm_plane *vs_primary_plane_init(struct
> drm_device *drm_dev, struct vs_dc
>  
>  	plane = drmm_universal_plane_alloc(drm_dev, struct
> drm_plane, dev, 0,
>  					   &vs_primary_plane_funcs,
> -					   dc->identity.formats-
> >array,
> -					   dc->identity.formats-
> >num,
> +					   dc->identity.formats-
> >primary_array,
> +					   dc->identity.formats-
> >primary_num,
>  					   NULL,
>  					   DRM_PLANE_TYPE_PRIMARY,
>  					   NULL);