On 4/8/26 14:24, Benjamin Cheng wrote:
> These defines can be shared.
>
> Signed-off-by: Benjamin Cheng <[email protected]>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 3 +++
> drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 3 ---
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 3 ---
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 3 ---
> 4 files changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> index 82624b44e661..fd9657ae6c37 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> @@ -57,6 +57,9 @@
> #define VCN_DEC_SW_CMD_REG_WRITE 0x0000000b
> #define VCN_DEC_SW_CMD_REG_WAIT 0x0000000c
>
> +#define RDECODE_MSG_CREATE 0x00000000
> +#define RDECODE_MESSAGE_CREATE 0x00000001
> +
As soon as it is in some header it should probably have an VCN_ prefix.
Regards,
Christian.
> #define VCN_ENC_CMD_NO_OP 0x00000000
> #define VCN_ENC_CMD_END 0x00000001
> #define VCN_ENC_CMD_IB 0x00000002
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> index 6fb4fcdbba4f..0e8eb4f671c0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> @@ -58,9 +58,6 @@
> #define VCN_INSTANCES_SIENNA_CICHLID 2
> #define DEC_SW_RING_ENABLED FALSE
>
> -#define RDECODE_MSG_CREATE 0x00000000
> -#define RDECODE_MESSAGE_CREATE
> 0x00000001
> -
> static const struct amdgpu_hwip_reg_entry vcn_reg_list_3_0[] = {
> SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_POWER_STATUS),
> SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_STATUS),
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> index 5dec92691f73..00abac9c7fd7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> @@ -50,9 +50,6 @@
>
> #define VCN_HARVEST_MMSCH
> 0
>
> -#define RDECODE_MSG_CREATE
> 0x00000000
> -#define RDECODE_MESSAGE_CREATE
> 0x00000001
> -
> static const struct amdgpu_hwip_reg_entry vcn_reg_list_4_0[] = {
> SOC15_REG_ENTRY_STR(VCN, 0, regUVD_POWER_STATUS),
> SOC15_REG_ENTRY_STR(VCN, 0, regUVD_STATUS),
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
> index 1f6a22983c0d..cbbc02d68695 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
> @@ -50,9 +50,6 @@
>
> #define VCN_HARVEST_MMSCH > 0
>
> -#define RDECODE_MSG_CREATE
> 0x00000000
> -#define RDECODE_MESSAGE_CREATE
> 0x00000001
> -
> static const struct amdgpu_hwip_reg_entry vcn_reg_list_4_0_5[] = {
> SOC15_REG_ENTRY_STR(VCN, 0, regUVD_POWER_STATUS),
> SOC15_REG_ENTRY_STR(VCN, 0, regUVD_STATUS),
