Skip to content

Commit ce2cca8

Browse files
Likun Gaogregkh
authored andcommitted
drm/amdgpu: remove frame cntl for gfx v12
commit 1034325 upstream. Remove emit_frame_cntl function for gfx v12, which is not support. Signed-off-by: Likun Gao <Likun.Gao@amd.com> Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 5aaa505) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 07e9373 commit ce2cca8

1 file changed

Lines changed: 0 additions & 12 deletions

File tree

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ static void gfx_v12_0_select_se_sh(struct amdgpu_device *adev, u32 se_num,
278278
u32 sh_num, u32 instance, int xcc_id);
279279
static u32 gfx_v12_0_get_wgp_active_bitmap_per_sh(struct amdgpu_device *adev);
280280

281-
static void gfx_v12_0_ring_emit_frame_cntl(struct amdgpu_ring *ring, bool start, bool secure);
282281
static void gfx_v12_0_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg,
283282
uint32_t val);
284283
static int gfx_v12_0_wait_for_rlc_autoload_complete(struct amdgpu_device *adev);
@@ -4633,16 +4632,6 @@ static int gfx_v12_0_ring_preempt_ib(struct amdgpu_ring *ring)
46334632
return r;
46344633
}
46354634

4636-
static void gfx_v12_0_ring_emit_frame_cntl(struct amdgpu_ring *ring,
4637-
bool start,
4638-
bool secure)
4639-
{
4640-
uint32_t v = secure ? FRAME_TMZ : 0;
4641-
4642-
amdgpu_ring_write(ring, PACKET3(PACKET3_FRAME_CONTROL, 0));
4643-
amdgpu_ring_write(ring, v | FRAME_CMD(start ? 0 : 1));
4644-
}
4645-
46464635
static void gfx_v12_0_ring_emit_rreg(struct amdgpu_ring *ring, uint32_t reg,
46474636
uint32_t reg_val_offs)
46484637
{
@@ -5519,7 +5508,6 @@ static const struct amdgpu_ring_funcs gfx_v12_0_ring_funcs_gfx = {
55195508
.emit_cntxcntl = gfx_v12_0_ring_emit_cntxcntl,
55205509
.init_cond_exec = gfx_v12_0_ring_emit_init_cond_exec,
55215510
.preempt_ib = gfx_v12_0_ring_preempt_ib,
5522-
.emit_frame_cntl = gfx_v12_0_ring_emit_frame_cntl,
55235511
.emit_wreg = gfx_v12_0_ring_emit_wreg,
55245512
.emit_reg_wait = gfx_v12_0_ring_emit_reg_wait,
55255513
.emit_reg_write_reg_wait = gfx_v12_0_ring_emit_reg_write_reg_wait,

0 commit comments

Comments
 (0)