drm/amdgpu: Remove PACKET2 from amdgpu since it is not used
Subsystems (2)
PATCH 1/1 drm/amdgpu: Remove PACKET2 from amdgpu since it is not used
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 <[email protected]>
--- 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(-)
drivers/gpu/drm/amd/amdgpu/cikd.h +0 -5
@@ -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) | \
drivers/gpu/drm/amd/amdgpu/nvd.h +0 -5
@@ -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) | \
drivers/gpu/drm/amd/amdgpu/sid.h +0 -5
@@ -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)))#define RADEON_PACKET_TYPE3 3#define PACKET3 (op, n) ((RADEON_PACKET_TYPE3 << 30) | \ (((op) & 0xFF) << 8) | \
drivers/gpu/drm/amd/amdgpu/soc15d.h +0 -5
@@ -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) | \
drivers/gpu/drm/amd/amdgpu/vid.h +0 -5
@@ -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) | \
Signature · 1 line
2.49.0
Quoted 51 lines · Rodrigo Siqueira
It looks like that
CP_PACKET2is 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 <[email protected]>--- 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(-)drivers/gpu/drm/amd/amdgpu/cikd.h +0
-5@@ -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) | \drivers/gpu/drm/amd/amdgpu/nvd.h +0
-5@@ -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) | \drivers/gpu/drm/amd/amdgpu/sid.h +0
-0
drivers/gpu/drm/amd/amdgpu/sid.h line 334
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/sid.h +0
-5@@ -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
Quoted 38 lines
drivers/gpu/drm/amd/amdgpu/sid.h +0
-0#define RADEON_PACKET_TYPE3 3#define PACKET3 (op, n) ((RADEON_PACKET_TYPE3 << 30) | \ (((op) & 0xFF) << 8) | \drivers/gpu/drm/amd/amdgpu/soc15d.h +0
-5@@ -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) | \drivers/gpu/drm/amd/amdgpu/vid.h +0
-6@@ -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