Skip to content

L
linux
Commit 4e872ae2 authored by Ilija Hadzic's avatar Ilija Hadzic Committed by Alex Deucher
Browse files
Options

drm/radeon: consolidate redundant macros and constants 

After refactoring the _cs logic, we ended up with many
macros and constants that #define the same thing.
Clean'em up.
Signed-off-by: default avatarIlija Hadzic <ihadzic@research.bell-labs.com>
Reviewed-by: default avatarMarek Olšák <maraeo@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 012e976d
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 104 deletions
drivers/gpu/drm/radeon/evergreen_cs.c
View file @ 4e872ae2
...@@ -2639,12 +2639,12 @@ int evergreen_cs_parse(struct radeon_cs_parser *p) ...@@ -2639,12 +2639,12 @@ int evergreen_cs_parse(struct radeon_cs_parser *p)
} }
p->idx += pkt.count + 2; p->idx += pkt.count + 2;
switch (pkt.type) { switch (pkt.type) {
case PACKET_TYPE0: case RADEON_PACKET_TYPE0:
r = evergreen_cs_parse_packet0(p, &pkt); r = evergreen_cs_parse_packet0(p, &pkt);
break; break;
case PACKET_TYPE2: case RADEON_PACKET_TYPE2:
break; break;
case PACKET_TYPE3: case RADEON_PACKET_TYPE3:
r = evergreen_packet3_check(p, &pkt); r = evergreen_packet3_check(p, &pkt);
break; break;
default: default:
...@@ -3395,19 +3395,19 @@ int evergreen_ib_parse(struct radeon_device *rdev, struct radeon_ib *ib) ...@@ -3395,19 +3395,19 @@ int evergreen_ib_parse(struct radeon_device *rdev, struct radeon_ib *ib)
do { do {
pkt.idx = idx; pkt.idx = idx;
pkt.type = CP_PACKET_GET_TYPE(ib->ptr[idx]); pkt.type = RADEON_CP_PACKET_GET_TYPE(ib->ptr[idx]);
pkt.count = CP_PACKET_GET_COUNT(ib->ptr[idx]); pkt.count = RADEON_CP_PACKET_GET_COUNT(ib->ptr[idx]);
pkt.one_reg_wr = 0; pkt.one_reg_wr = 0;
switch (pkt.type) { switch (pkt.type) {
case PACKET_TYPE0: case RADEON_PACKET_TYPE0:
dev_err(rdev->dev, "Packet0 not allowed!\n"); dev_err(rdev->dev, "Packet0 not allowed!\n");
ret = -EINVAL; ret = -EINVAL;
break; break;
case PACKET_TYPE2: case RADEON_PACKET_TYPE2:
idx += 1; idx += 1;
break; break;
case PACKET_TYPE3: case RADEON_PACKET_TYPE3:
pkt.opcode = CP_PACKET3_GET_OPCODE(ib->ptr[idx]); pkt.opcode = RADEON_CP_PACKET3_GET_OPCODE(ib->ptr[idx]);
ret = evergreen_vm_packet3_check(rdev, ib->ptr, &pkt); ret = evergreen_vm_packet3_check(rdev, ib->ptr, &pkt);
idx += pkt.count + 2; idx += pkt.count + 2;
break; break;
......
drivers/gpu/drm/radeon/evergreend.h
View file @ 4e872ae2
...@@ -980,16 +980,7 @@ ...@@ -980,16 +980,7 @@
/* /*
* PM4 * PM4
*/ */
#define PACKET_TYPE0 0 #define PACKET0(reg, n) ((RADEON_PACKET_TYPE0 << 30) | \
#define PACKET_TYPE1 1
#define PACKET_TYPE2 2
#define PACKET_TYPE3 3
#define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3)
#define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF)
#define CP_PACKET0_GET_REG(h) (((h) & 0xFFFF) << 2)
#define CP_PACKET3_GET_OPCODE(h) (((h) >> 8) & 0xFF)
#define PACKET0(reg, n) ((PACKET_TYPE0 << 30) | \
(((reg) >> 2) & 0xFFFF) | \ (((reg) >> 2) & 0xFFFF) | \
((n) & 0x3FFF) << 16) ((n) & 0x3FFF) << 16)
#define CP_PACKET2 0x80000000 #define CP_PACKET2 0x80000000
...@@ -998,7 +989,7 @@ ...@@ -998,7 +989,7 @@
#define PACKET2(v) (CP_PACKET2 | REG_SET(PACKET2_PAD, (v))) #define PACKET2(v) (CP_PACKET2 | REG_SET(PACKET2_PAD, (v)))
#define PACKET3(op, n) ((PACKET_TYPE3 << 30) | \ #define PACKET3(op, n) ((RADEON_PACKET_TYPE3 << 30) | \
(((op) & 0xFF) << 8) | \ (((op) & 0xFF) << 8) | \
((n) & 0x3FFF) << 16) ((n) & 0x3FFF) << 16)
......
drivers/gpu/drm/radeon/nid.h
View file @ 4e872ae2
...@@ -474,16 +474,7 @@ ...@@ -474,16 +474,7 @@
/* /*
* PM4 * PM4
*/ */
#define PACKET_TYPE0 0 #define PACKET0(reg, n) ((RADEON_PACKET_TYPE0 << 30) | \
#define PACKET_TYPE1 1
#define PACKET_TYPE2 2
#define PACKET_TYPE3 3
#define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3)
#define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF)
#define CP_PACKET0_GET_REG(h) (((h) & 0xFFFF) << 2)
#define CP_PACKET3_GET_OPCODE(h) (((h) >> 8) & 0xFF)
#define PACKET0(reg, n) ((PACKET_TYPE0 << 30) | \
(((reg) >> 2) & 0xFFFF) | \ (((reg) >> 2) & 0xFFFF) | \
((n) & 0x3FFF) << 16) ((n) & 0x3FFF) << 16)
#define CP_PACKET2 0x80000000 #define CP_PACKET2 0x80000000
...@@ -492,7 +483,7 @@ ...@@ -492,7 +483,7 @@
#define PACKET2(v) (CP_PACKET2 | REG_SET(PACKET2_PAD, (v))) #define PACKET2(v) (CP_PACKET2 | REG_SET(PACKET2_PAD, (v)))
#define PACKET3(op, n) ((PACKET_TYPE3 << 30) | \ #define PACKET3(op, n) ((RADEON_PACKET_TYPE3 << 30) | \
(((op) & 0xFF) << 8) | \ (((op) & 0xFF) << 8) | \
((n) & 0x3FFF) << 16) ((n) & 0x3FFF) << 16)
......
drivers/gpu/drm/radeon/r100.c
View file @ 4e872ae2
...@@ -1410,7 +1410,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p) ...@@ -1410,7 +1410,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p)
header = radeon_get_ib_value(p, h_idx); header = radeon_get_ib_value(p, h_idx);
crtc_id = radeon_get_ib_value(p, h_idx + 5); crtc_id = radeon_get_ib_value(p, h_idx + 5);
reg = CP_PACKET0_GET_REG(header); reg = R100_CP_PACKET0_GET_REG(header);
obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC); obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC);
if (!obj) { if (!obj) {
DRM_ERROR("cannot find crtc %d\n", crtc_id); DRM_ERROR("cannot find crtc %d\n", crtc_id);
...@@ -1997,7 +1997,7 @@ int r100_cs_parse(struct radeon_cs_parser *p) ...@@ -1997,7 +1997,7 @@ int r100_cs_parse(struct radeon_cs_parser *p)
} }
p->idx += pkt.count + 2; p->idx += pkt.count + 2;
switch (pkt.type) { switch (pkt.type) {
case PACKET_TYPE0: case RADEON_PACKET_TYPE0:
if (p->rdev->family >= CHIP_R200) if (p->rdev->family >= CHIP_R200)
r = r100_cs_parse_packet0(p, &pkt, r = r100_cs_parse_packet0(p, &pkt,
p->rdev->config.r100.reg_safe_bm, p->rdev->config.r100.reg_safe_bm,
...@@ -2009,9 +2009,9 @@ int r100_cs_parse(struct radeon_cs_parser *p) ...@@ -2009,9 +2009,9 @@ int r100_cs_parse(struct radeon_cs_parser *p)
p->rdev->config.r100.reg_safe_bm_size, p->rdev->config.r100.reg_safe_bm_size,
&r100_packet0_check); &r100_packet0_check);
break; break;
case PACKET_TYPE2: case RADEON_PACKET_TYPE2:
break; break;
case PACKET_TYPE3: case RADEON_PACKET_TYPE3:
r = r100_packet3_check(p, &pkt); r = r100_packet3_check(p, &pkt);
break; break;
default: default:
......
drivers/gpu/drm/radeon/r100d.h
View file @ 4e872ae2
...@@ -64,17 +64,6 @@ ...@@ -64,17 +64,6 @@
REG_SET(PACKET3_IT_OPCODE, (op)) | \ REG_SET(PACKET3_IT_OPCODE, (op)) | \
REG_SET(PACKET3_COUNT, (n))) REG_SET(PACKET3_COUNT, (n)))
#define PACKET_TYPE0 0
#define PACKET_TYPE1 1
#define PACKET_TYPE2 2
#define PACKET_TYPE3 3
#define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3)
#define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF)
#define CP_PACKET0_GET_REG(h) (((h) & 0x1FFF) << 2)
#define CP_PACKET0_GET_ONE_REG_WR(h) (((h) >> 15) & 1)
#define CP_PACKET3_GET_OPCODE(h) (((h) >> 8) & 0xFF)
/* Registers */ /* Registers */
#define R_0000F0_RBBM_SOFT_RESET 0x0000F0 #define R_0000F0_RBBM_SOFT_RESET 0x0000F0
#define S_0000F0_SOFT_RESET_CP(x) (((x) & 0x1) << 0) #define S_0000F0_SOFT_RESET_CP(x) (((x) & 0x1) << 0)
......
drivers/gpu/drm/radeon/r300.c
View file @ 4e872ae2
...@@ -1263,15 +1263,15 @@ int r300_cs_parse(struct radeon_cs_parser *p) ...@@ -1263,15 +1263,15 @@ int r300_cs_parse(struct radeon_cs_parser *p)
} }
p->idx += pkt.count + 2; p->idx += pkt.count + 2;
switch (pkt.type) { switch (pkt.type) {
case PACKET_TYPE0: case RADEON_PACKET_TYPE0:
r = r100_cs_parse_packet0(p, &pkt, r = r100_cs_parse_packet0(p, &pkt,
p->rdev->config.r300.reg_safe_bm, p->rdev->config.r300.reg_safe_bm,
p->rdev->config.r300.reg_safe_bm_size, p->rdev->config.r300.reg_safe_bm_size,
&r300_packet0_check); &r300_packet0_check);
break; break;
case PACKET_TYPE2: case RADEON_PACKET_TYPE2:
break; break;
case PACKET_TYPE3: case RADEON_PACKET_TYPE3:
r = r300_packet3_check(p, &pkt); r = r300_packet3_check(p, &pkt);
break; break;
default: default:
......
drivers/gpu/drm/radeon/r300d.h
View file @ 4e872ae2
...@@ -65,17 +65,6 @@ ...@@ -65,17 +65,6 @@
REG_SET(PACKET3_IT_OPCODE, (op)) | \ REG_SET(PACKET3_IT_OPCODE, (op)) | \
REG_SET(PACKET3_COUNT, (n))) REG_SET(PACKET3_COUNT, (n)))
#define PACKET_TYPE0 0
#define PACKET_TYPE1 1
#define PACKET_TYPE2 2
#define PACKET_TYPE3 3
#define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3)
#define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF)
#define CP_PACKET0_GET_REG(h) (((h) & 0x1FFF) << 2)
#define CP_PACKET0_GET_ONE_REG_WR(h) (((h) >> 15) & 1)
#define CP_PACKET3_GET_OPCODE(h) (((h) >> 8) & 0xFF)
/* Registers */ /* Registers */
#define R_000148_MC_FB_LOCATION 0x000148 #define R_000148_MC_FB_LOCATION 0x000148
#define S_000148_MC_FB_START(x) (((x) & 0xFFFF) << 0) #define S_000148_MC_FB_START(x) (((x) & 0xFFFF) << 0)
......
drivers/gpu/drm/radeon/r600_cs.c
View file @ 4e872ae2
...@@ -839,7 +839,7 @@ int r600_cs_common_vline_parse(struct radeon_cs_parser *p, ...@@ -839,7 +839,7 @@ int r600_cs_common_vline_parse(struct radeon_cs_parser *p,
return r; return r;
/* check its a WAIT_REG_MEM */ /* check its a WAIT_REG_MEM */
if (wait_reg_mem.type != PACKET_TYPE3 || if (wait_reg_mem.type != RADEON_PACKET_TYPE3 ||
wait_reg_mem.opcode != PACKET3_WAIT_REG_MEM) { wait_reg_mem.opcode != PACKET3_WAIT_REG_MEM) {
DRM_ERROR("vline wait missing WAIT_REG_MEM segment\n"); DRM_ERROR("vline wait missing WAIT_REG_MEM segment\n");
return -EINVAL; return -EINVAL;
...@@ -882,7 +882,7 @@ int r600_cs_common_vline_parse(struct radeon_cs_parser *p, ...@@ -882,7 +882,7 @@ int r600_cs_common_vline_parse(struct radeon_cs_parser *p,
header = radeon_get_ib_value(p, h_idx); header = radeon_get_ib_value(p, h_idx);
crtc_id = radeon_get_ib_value(p, h_idx + 2 + 7 + 1); crtc_id = radeon_get_ib_value(p, h_idx + 2 + 7 + 1);
reg = CP_PACKET0_GET_REG(header); reg = R600_CP_PACKET0_GET_REG(header);
obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC); obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC);
if (!obj) { if (!obj) {
...@@ -2282,12 +2282,12 @@ int r600_cs_parse(struct radeon_cs_parser *p) ...@@ -2282,12 +2282,12 @@ int r600_cs_parse(struct radeon_cs_parser *p)
} }
p->idx += pkt.count + 2; p->idx += pkt.count + 2;
switch (pkt.type) { switch (pkt.type) {
case PACKET_TYPE0: case RADEON_PACKET_TYPE0:
r = r600_cs_parse_packet0(p, &pkt); r = r600_cs_parse_packet0(p, &pkt);
break; break;
case PACKET_TYPE2: case RADEON_PACKET_TYPE2:
break; break;
case PACKET_TYPE3: case RADEON_PACKET_TYPE3:
r = r600_packet3_check(p, &pkt); r = r600_packet3_check(p, &pkt);
break; break;
default: default:
......
drivers/gpu/drm/radeon/r600d.h
View file @ 4e872ae2
...@@ -1143,19 +1143,10 @@ ...@@ -1143,19 +1143,10 @@
/* /*
* PM4 * PM4
*/ */
#define PACKET_TYPE0 0 #define PACKET0(reg, n) ((RADEON_PACKET_TYPE0 << 30) | \
#define PACKET_TYPE1 1
#define PACKET_TYPE2 2
#define PACKET_TYPE3 3
#define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3)
#define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF)
#define CP_PACKET0_GET_REG(h) (((h) & 0xFFFF) << 2)
#define CP_PACKET3_GET_OPCODE(h) (((h) >> 8) & 0xFF)
#define PACKET0(reg, n) ((PACKET_TYPE0 << 30) | \
(((reg) >> 2) & 0xFFFF) | \ (((reg) >> 2) & 0xFFFF) | \
((n) & 0x3FFF) << 16) ((n) & 0x3FFF) << 16)
#define PACKET3(op, n) ((PACKET_TYPE3 << 30) | \ #define PACKET3(op, n) ((RADEON_PACKET_TYPE3 << 30) | \
(((op) & 0xFF) << 8) | \ (((op) & 0xFF) << 8) | \
((n) & 0x3FFF) << 16) ((n) & 0x3FFF) << 16)
......
drivers/gpu/drm/radeon/rv515d.h
View file @ 4e872ae2
...@@ -205,17 +205,6 @@ ...@@ -205,17 +205,6 @@
REG_SET(PACKET3_IT_OPCODE, (op)) | \ REG_SET(PACKET3_IT_OPCODE, (op)) | \
REG_SET(PACKET3_COUNT, (n))) REG_SET(PACKET3_COUNT, (n)))
#define PACKET_TYPE0 0
#define PACKET_TYPE1 1
#define PACKET_TYPE2 2
#define PACKET_TYPE3 3
#define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3)
#define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF)
#define CP_PACKET0_GET_REG(h) (((h) & 0x1FFF) << 2)
#define CP_PACKET0_GET_ONE_REG_WR(h) (((h) >> 15) & 1)
#define CP_PACKET3_GET_OPCODE(h) (((h) >> 8) & 0xFF)
/* Registers */ /* Registers */
#define R_0000F0_RBBM_SOFT_RESET 0x0000F0 #define R_0000F0_RBBM_SOFT_RESET 0x0000F0
#define S_0000F0_SOFT_RESET_CP(x) (((x) & 0x1) << 0) #define S_0000F0_SOFT_RESET_CP(x) (((x) & 0x1) << 0)
......
drivers/gpu/drm/radeon/si.c
View file @ 4e872ae2
...@@ -2855,19 +2855,19 @@ int si_ib_parse(struct radeon_device *rdev, struct radeon_ib *ib) ...@@ -2855,19 +2855,19 @@ int si_ib_parse(struct radeon_device *rdev, struct radeon_ib *ib)
do { do {
pkt.idx = idx; pkt.idx = idx;
pkt.type = CP_PACKET_GET_TYPE(ib->ptr[idx]); pkt.type = RADEON_CP_PACKET_GET_TYPE(ib->ptr[idx]);
pkt.count = CP_PACKET_GET_COUNT(ib->ptr[idx]); pkt.count = RADEON_CP_PACKET_GET_COUNT(ib->ptr[idx]);
pkt.one_reg_wr = 0; pkt.one_reg_wr = 0;
switch (pkt.type) { switch (pkt.type) {
case PACKET_TYPE0: case RADEON_PACKET_TYPE0:
dev_err(rdev->dev, "Packet0 not allowed!\n"); dev_err(rdev->dev, "Packet0 not allowed!\n");
ret = -EINVAL; ret = -EINVAL;
break; break;
case PACKET_TYPE2: case RADEON_PACKET_TYPE2:
idx += 1; idx += 1;
break; break;
case PACKET_TYPE3: case RADEON_PACKET_TYPE3:
pkt.opcode = CP_PACKET3_GET_OPCODE(ib->ptr[idx]); pkt.opcode = RADEON_CP_PACKET3_GET_OPCODE(ib->ptr[idx]);
if (ib->is_const_ib) if (ib->is_const_ib)
ret = si_vm_packet3_ce_check(rdev, ib->ptr, &pkt); ret = si_vm_packet3_ce_check(rdev, ib->ptr, &pkt);
else { else {
......
drivers/gpu/drm/radeon/sid.h
View file @ 4e872ae2
...@@ -783,16 +783,7 @@ ...@@ -783,16 +783,7 @@
/* /*
* PM4 * PM4
*/ */
#define PACKET_TYPE0 0 #define PACKET0(reg, n) ((RADEON_PACKET_TYPE0 << 30) | \
#define PACKET_TYPE1 1
#define PACKET_TYPE2 2
#define PACKET_TYPE3 3
#define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3)
#define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF)
#define CP_PACKET0_GET_REG(h) (((h) & 0xFFFF) << 2)
#define CP_PACKET3_GET_OPCODE(h) (((h) >> 8) & 0xFF)
#define PACKET0(reg, n) ((PACKET_TYPE0 << 30) | \
(((reg) >> 2) & 0xFFFF) | \ (((reg) >> 2) & 0xFFFF) | \
((n) & 0x3FFF) << 16) ((n) & 0x3FFF) << 16)
#define CP_PACKET2 0x80000000 #define CP_PACKET2 0x80000000
...@@ -801,7 +792,7 @@ ...@@ -801,7 +792,7 @@
#define PACKET2(v) (CP_PACKET2 | REG_SET(PACKET2_PAD, (v))) #define PACKET2(v) (CP_PACKET2 | REG_SET(PACKET2_PAD, (v)))
#define PACKET3(op, n) ((PACKET_TYPE3 << 30) | \ #define PACKET3(op, n) ((RADEON_PACKET_TYPE3 << 30) | \
(((op) & 0xFF) << 8) | \ (((op) & 0xFF) << 8) | \
((n) & 0x3FFF) << 16) ((n) & 0x3FFF) << 16)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7