Commit 5aaa5058 authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amdgpu: remove frame cntl for gfx v12 



Remove emit_frame_cntl function for gfx v12, which is not support.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d4a814f4

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

+0 −12
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ static void gfx_v12_0_select_se_sh(struct amdgpu_device *adev, u32 se_num, 
				   u32 sh_num, u32 instance, int xcc_id);

static u32 gfx_v12_0_get_wgp_active_bitmap_per_sh(struct amdgpu_device *adev);



static void gfx_v12_0_ring_emit_frame_cntl(struct amdgpu_ring *ring, bool start, bool secure);

static void gfx_v12_0_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg,

				     uint32_t val);

static int gfx_v12_0_wait_for_rlc_autoload_complete(struct amdgpu_device *adev);
@@ -4629,16 +4628,6 @@ static int gfx_v12_0_ring_preempt_ib(struct amdgpu_ring *ring) 
	return r;

}



static void gfx_v12_0_ring_emit_frame_cntl(struct amdgpu_ring *ring,

					   bool start,

					   bool secure)

{

	uint32_t v = secure ? FRAME_TMZ : 0;



	amdgpu_ring_write(ring, PACKET3(PACKET3_FRAME_CONTROL, 0));

	amdgpu_ring_write(ring, v | FRAME_CMD(start ? 0 : 1));

}



static void gfx_v12_0_ring_emit_rreg(struct amdgpu_ring *ring, uint32_t reg,

				     uint32_t reg_val_offs)

{
@@ -5515,7 +5504,6 @@ static const struct amdgpu_ring_funcs gfx_v12_0_ring_funcs_gfx = { 
	.emit_cntxcntl = gfx_v12_0_ring_emit_cntxcntl,

	.init_cond_exec = gfx_v12_0_ring_emit_init_cond_exec,

	.preempt_ib = gfx_v12_0_ring_preempt_ib,

	.emit_frame_cntl = gfx_v12_0_ring_emit_frame_cntl,

	.emit_wreg = gfx_v12_0_ring_emit_wreg,

	.emit_reg_wait = gfx_v12_0_ring_emit_reg_wait,

	.emit_reg_write_reg_wait = gfx_v12_0_ring_emit_reg_write_reg_wait,