[PATCH] drm/amdgpu: Remove PACKET2 from amdgpu since it is not used

[Alex Deucher]

On Sat, Apr 12, 2025 at 4:44 PM Rodrigo Siqueira <siqueira at igalia.com> wrote:
>
> It looks like that CP_PACKET2 is from the radeon GPU driver and was
> brought to amdgpu, but it was never used. This commit removes PACKET2
> and related defines from amdgpu.
>
> Signed-off-by: Rodrigo Siqueira <siqueira at igalia.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/cikd.h   | 5 -----
>  drivers/gpu/drm/amd/amdgpu/nvd.h    | 5 -----
>  drivers/gpu/drm/amd/amdgpu/sid.h    | 5 -----
>  drivers/gpu/drm/amd/amdgpu/soc15d.h | 5 -----
>  drivers/gpu/drm/amd/amdgpu/vid.h    | 5 -----
>  5 files changed, 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/cikd.h b/drivers/gpu/drm/amd/amdgpu/cikd.h
> index 8aca4f2734f2..793e072fac8f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/cikd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/cikd.h
> @@ -220,11 +220,6 @@
>  #define PACKET0(reg, n)        ((PACKET_TYPE0 << 30) |                         \
>                          ((reg) & 0xFFFF) |                     \
>                          ((n) & 0x3FFF) << 16)
> -#define CP_PACKET2                     0x80000000
> -#define                PACKET2_PAD_SHIFT               0
> -#define                PACKET2_PAD_MASK                (0x3fffffff << 0)
> -
> -#define PACKET2(v)     (CP_PACKET2 | REG_SET(PACKET2_PAD, (v)))
>
>  #define PACKET3(op, n) ((PACKET_TYPE3 << 30) |                         \
>                          (((op) & 0xFF) << 8) |                         \
> diff --git a/drivers/gpu/drm/amd/amdgpu/nvd.h b/drivers/gpu/drm/amd/amdgpu/nvd.h
> index 56f1bfac0b20..2b1cd5622182 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nvd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/nvd.h
> @@ -39,11 +39,6 @@
>  #define PACKET0(reg, n)        ((PACKET_TYPE0 << 30) |                         \
>                          ((reg) & 0xFFFF) |                     \
>                          ((n) & 0x3FFF) << 16)
> -#define CP_PACKET2                     0x80000000
> -#define                PACKET2_PAD_SHIFT               0
> -#define                PACKET2_PAD_MASK                (0x3fffffff << 0)
> -
> -#define PACKET2(v)     (CP_PACKET2 | REG_SET(PACKET2_PAD, (v)))
>
>  #define PACKET3(op, n) ((PACKET_TYPE3 << 30) |                         \
>                          (((op) & 0xFF) << 8) |                         \
> diff --git a/drivers/gpu/drm/amd/amdgpu/sid.h b/drivers/gpu/drm/amd/amdgpu/sid.h
> index cbd4f8951cfa..e6da0ecd4058 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sid.h
> +++ b/drivers/gpu/drm/amd/amdgpu/sid.h
> @@ -327,11 +327,6 @@
>  #define PACKET0(reg, n) ((PACKET_TYPE0 << 30) |                                \
>                           ((reg) & 0xFFFF) |                            \
>                           ((n) & 0x3FFF) << 16)
> -#define CP_PACKET2                     0x80000000
> -#define                PACKET2_PAD_SHIFT               0
> -#define                PACKET2_PAD_MASK                (0x3fffffff << 0)
> -
> -#define PACKET2(v)     (CP_PACKET2 | REG_SET(PACKET2_PAD, (v)))

It's still used on SI.  from gfx_v6_0.c

        .nop = 0x80000000,

Alex

>  #define RADEON_PACKET_TYPE3 3
>  #define PACKET3(op, n) ((RADEON_PACKET_TYPE3 << 30) |                  \
>                          (((op) & 0xFF) << 8) |                         \
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15d.h b/drivers/gpu/drm/amd/amdgpu/soc15d.h
> index a5000c171c02..a4c49e184c4d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15d.h
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15d.h
> @@ -41,11 +41,6 @@
>  #define PACKET0(reg, n)        ((PACKET_TYPE0 << 30) |                         \
>                          ((reg) & 0xFFFF) |                     \
>                          ((n) & 0x3FFF) << 16)
> -#define CP_PACKET2                     0x80000000
> -#define                PACKET2_PAD_SHIFT               0
> -#define                PACKET2_PAD_MASK                (0x3fffffff << 0)
> -
> -#define PACKET2(v)     (CP_PACKET2 | REG_SET(PACKET2_PAD, (v)))
>
>  #define PACKET3(op, n) ((PACKET_TYPE3 << 30) |                         \
>                          (((op) & 0xFF) << 8) |                         \
> diff --git a/drivers/gpu/drm/amd/amdgpu/vid.h b/drivers/gpu/drm/amd/amdgpu/vid.h
> index b61f6b838ec2..f20553c61ada 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vid.h
> +++ b/drivers/gpu/drm/amd/amdgpu/vid.h
> @@ -96,11 +96,6 @@
>  #define PACKET0(reg, n)        ((PACKET_TYPE0 << 30) |                         \
>                          ((reg) & 0xFFFF) |                     \
>                          ((n) & 0x3FFF) << 16)
> -#define CP_PACKET2                     0x80000000
> -#define                PACKET2_PAD_SHIFT               0
> -#define                PACKET2_PAD_MASK                (0x3fffffff << 0)
> -
> -#define PACKET2(v)     (CP_PACKET2 | REG_SET(PACKET2_PAD, (v)))
>
>  #define PACKET3(op, n) ((PACKET_TYPE3 << 30) |                         \
>                          (((op) & 0xFF) << 8) |                         \
> --
> 2.49.0
>