Skip to content

Commit 6c1a6d0

Browse files
Jie1zhangalexdeucher
authored andcommitted
amd/amdgpu: remove test ib on hw ring
test ib function is not necessary on hw ring, so remove it. v2: squash in NULL check fix Signed-off-by: JesseZhang <[email protected]> Acked-by: Christian König <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 5ad7bbf commit 6c1a6d0

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ struct amdgpu_ring {
295295
#define amdgpu_ring_parse_cs(r, p, job, ib) ((r)->funcs->parse_cs((p), (job), (ib)))
296296
#define amdgpu_ring_patch_cs_in_place(r, p, job, ib) ((r)->funcs->patch_cs_in_place((p), (job), (ib)))
297297
#define amdgpu_ring_test_ring(r) (r)->funcs->test_ring((r))
298-
#define amdgpu_ring_test_ib(r, t) (r)->funcs->test_ib((r), (t))
298+
#define amdgpu_ring_test_ib(r, t) ((r)->funcs->test_ib ? (r)->funcs->test_ib((r), (t)) : 0)
299299
#define amdgpu_ring_get_rptr(r) (r)->funcs->get_rptr((r))
300300
#define amdgpu_ring_get_wptr(r) (r)->funcs->get_wptr((r))
301301
#define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r))

drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6877,7 +6877,6 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = {
68776877
.emit_gds_switch = gfx_v9_0_ring_emit_gds_switch,
68786878
.emit_hdp_flush = gfx_v9_0_ring_emit_hdp_flush,
68796879
.test_ring = gfx_v9_0_ring_test_ring,
6880-
.test_ib = gfx_v9_0_ring_test_ib,
68816880
.insert_nop = amdgpu_ring_insert_nop,
68826881
.pad_ib = amdgpu_ring_generic_pad_ib,
68836882
.emit_switch_buffer = gfx_v9_ring_emit_sb,

0 commit comments

Comments
 (0)