[PATCH v2 1/7] drm/ast: Replace AST_VIDMEM_SIZE_ with Linux SZ_ constants

[Jocelyn Falempe]

On 05/03/2025 17:30, Thomas Zimmermann wrote:
> Ast's AST_VIDMEM_SIZE_ constants enumerate supported video-memory
> sizes from 8 MiB to 128 MiB. Replace them with Linux' SZ_ constants
> of the same value. When expanded, the literal values remain the same.
> 
> The size constant for 128 MiB is unused and the default size is not
> necessary. Remove both of them.

Thanks, it looks good to me.

Reviewed-by: Jocelyn Falempe <jfalempe at redhat.com>
> 
> Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
> ---
>   drivers/gpu/drm/ast/ast_drv.h  |  8 --------
>   drivers/gpu/drm/ast/ast_mm.c   |  9 ++++-----
>   drivers/gpu/drm/ast/ast_post.c | 24 ++++++++++++------------
>   3 files changed, 16 insertions(+), 25 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
> index d2c2605d2728..2c7861835cfb 100644
> --- a/drivers/gpu/drm/ast/ast_drv.h
> +++ b/drivers/gpu/drm/ast/ast_drv.h
> @@ -340,14 +340,6 @@ static inline void ast_set_index_reg_mask(struct ast_device *ast, u32 base, u8 i
>   	__ast_write8_i_masked(ast->ioregs, base, index, preserve_mask, val);
>   }
>   
> -#define AST_VIDMEM_SIZE_8M    0x00800000
> -#define AST_VIDMEM_SIZE_16M   0x01000000
> -#define AST_VIDMEM_SIZE_32M   0x02000000
> -#define AST_VIDMEM_SIZE_64M   0x04000000
> -#define AST_VIDMEM_SIZE_128M  0x08000000
> -
> -#define AST_VIDMEM_DEFAULT_SIZE AST_VIDMEM_SIZE_8M
> -
>   struct ast_vbios_stdtable {
>   	u8 misc;
>   	u8 seq[4];
> diff --git a/drivers/gpu/drm/ast/ast_mm.c b/drivers/gpu/drm/ast/ast_mm.c
> index 6dfe6d9777d4..20d833632a01 100644
> --- a/drivers/gpu/drm/ast/ast_mm.c
> +++ b/drivers/gpu/drm/ast/ast_mm.c
> @@ -38,20 +38,19 @@ static u32 ast_get_vram_size(struct ast_device *ast)
>   	u8 jreg;
>   	u32 vram_size;
>   
> -	vram_size = AST_VIDMEM_DEFAULT_SIZE;
>   	jreg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xaa, 0xff);
>   	switch (jreg & 3) {
>   	case 0:
> -		vram_size = AST_VIDMEM_SIZE_8M;
> +		vram_size = SZ_8M;
>   		break;
>   	case 1:
> -		vram_size = AST_VIDMEM_SIZE_16M;
> +		vram_size = SZ_16M;
>   		break;
>   	case 2:
> -		vram_size = AST_VIDMEM_SIZE_32M;
> +		vram_size = SZ_32M;
>   		break;
>   	case 3:
> -		vram_size = AST_VIDMEM_SIZE_64M;
> +		vram_size = SZ_64M;
>   		break;
>   	}
>   
> diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
> index 91e85e457bdf..37568cf3822c 100644
> --- a/drivers/gpu/drm/ast/ast_post.c
> +++ b/drivers/gpu/drm/ast/ast_post.c
> @@ -1075,16 +1075,16 @@ static void get_ddr3_info(struct ast_device *ast, struct ast2300_dram_param *par
>   
>   	switch (param->vram_size) {
>   	default:
> -	case AST_VIDMEM_SIZE_8M:
> +	case SZ_8M:
>   		param->dram_config |= 0x00;
>   		break;
> -	case AST_VIDMEM_SIZE_16M:
> +	case SZ_16M:
>   		param->dram_config |= 0x04;
>   		break;
> -	case AST_VIDMEM_SIZE_32M:
> +	case SZ_32M:
>   		param->dram_config |= 0x08;
>   		break;
> -	case AST_VIDMEM_SIZE_64M:
> +	case SZ_64M:
>   		param->dram_config |= 0x0c;
>   		break;
>   	}
> @@ -1446,16 +1446,16 @@ static void get_ddr2_info(struct ast_device *ast, struct ast2300_dram_param *par
>   
>   	switch (param->vram_size) {
>   	default:
> -	case AST_VIDMEM_SIZE_8M:
> +	case SZ_8M:
>   		param->dram_config |= 0x00;
>   		break;
> -	case AST_VIDMEM_SIZE_16M:
> +	case SZ_16M:
>   		param->dram_config |= 0x04;
>   		break;
> -	case AST_VIDMEM_SIZE_32M:
> +	case SZ_32M:
>   		param->dram_config |= 0x08;
>   		break;
> -	case AST_VIDMEM_SIZE_64M:
> +	case SZ_64M:
>   		param->dram_config |= 0x0c;
>   		break;
>   	}
> @@ -1635,19 +1635,19 @@ static void ast_post_chip_2300(struct ast_device *ast)
>                   switch (temp & 0x0c) {
>                   default:
>   		case 0x00:
> -			param.vram_size = AST_VIDMEM_SIZE_8M;
> +			param.vram_size = SZ_8M;
>   			break;
>   
>   		case 0x04:
> -			param.vram_size = AST_VIDMEM_SIZE_16M;
> +			param.vram_size = SZ_16M;
>   			break;
>   
>   		case 0x08:
> -			param.vram_size = AST_VIDMEM_SIZE_32M;
> +			param.vram_size = SZ_32M;
>   			break;
>   
>   		case 0x0c:
> -			param.vram_size = AST_VIDMEM_SIZE_64M;
> +			param.vram_size = SZ_64M;
>   			break;
>   		}
>