Commit e8a9c688 authored by JesseZhang's avatar JesseZhang Committed by Alex Deucher
Browse files

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: default avatarJesseZhang <Jesse.Zhang@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 70f1872e

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

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ struct amdgpu_ring { 
#define amdgpu_ring_parse_cs(r, p, job, ib) ((r)->funcs->parse_cs((p), (job), (ib)))

#define amdgpu_ring_patch_cs_in_place(r, p, job, ib) ((r)->funcs->patch_cs_in_place((p), (job), (ib)))

#define amdgpu_ring_test_ring(r) (r)->funcs->test_ring((r))

#define amdgpu_ring_test_ib(r, t) (r)->funcs->test_ib((r), (t))

#define amdgpu_ring_test_ib(r, t) ((r)->funcs->test_ib ? (r)->funcs->test_ib((r), (t)) : 0)

#define amdgpu_ring_get_rptr(r) (r)->funcs->get_rptr((r))

#define amdgpu_ring_get_wptr(r) (r)->funcs->get_wptr((r))

#define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r))

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

+0 −1
Original line number Diff line number Diff line
@@ -6783,7 +6783,6 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_gfx = { 
	.emit_gds_switch = gfx_v9_0_ring_emit_gds_switch,

	.emit_hdp_flush = gfx_v9_0_ring_emit_hdp_flush,

	.test_ring = gfx_v9_0_ring_test_ring,

	.test_ib = gfx_v9_0_ring_test_ib,

	.insert_nop = amdgpu_ring_insert_nop,

	.pad_ib = amdgpu_ring_generic_pad_ib,

	.emit_switch_buffer = gfx_v9_ring_emit_sb,