Skip to content

Commit f72b579

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 ea4a98e commit f72b579

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
@@ -248,7 +248,6 @@ static void gfx_v12_0_select_se_sh(struct amdgpu_device *adev, u32 se_num,
248248
u32 sh_num, u32 instance, int xcc_id);
249249
static u32 gfx_v12_0_get_wgp_active_bitmap_per_sh(struct amdgpu_device *adev);
250250

251-
static void gfx_v12_0_ring_emit_frame_cntl(struct amdgpu_ring *ring, bool start, bool secure);
252251
static void gfx_v12_0_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg,
253252
uint32_t val);
254253
static int gfx_v12_0_wait_for_rlc_autoload_complete(struct amdgpu_device *adev);
@@ -4556,16 +4555,6 @@ static int gfx_v12_0_ring_preempt_ib(struct amdgpu_ring *ring)
45564555
return r;
45574556
}
45584557

4559-
static void gfx_v12_0_ring_emit_frame_cntl(struct amdgpu_ring *ring,
4560-
bool start,
4561-
bool secure)
4562-
{
4563-
uint32_t v = secure ? FRAME_TMZ : 0;
4564-
4565-
amdgpu_ring_write(ring, PACKET3(PACKET3_FRAME_CONTROL, 0));
4566-
amdgpu_ring_write(ring, v | FRAME_CMD(start ? 0 : 1));
4567-
}
4568-
45694558
static void gfx_v12_0_ring_emit_rreg(struct amdgpu_ring *ring, uint32_t reg,
45704559
uint32_t reg_val_offs)
45714560
{
@@ -5316,7 +5305,6 @@ static const struct amdgpu_ring_funcs gfx_v12_0_ring_funcs_gfx = {
53165305
.emit_cntxcntl = gfx_v12_0_ring_emit_cntxcntl,
53175306
.init_cond_exec = gfx_v12_0_ring_emit_init_cond_exec,
53185307
.preempt_ib = gfx_v12_0_ring_preempt_ib,
5319-
.emit_frame_cntl = gfx_v12_0_ring_emit_frame_cntl,
53205308
.emit_wreg = gfx_v12_0_ring_emit_wreg,
53215309
.emit_reg_wait = gfx_v12_0_ring_emit_reg_wait,
53225310
.emit_reg_write_reg_wait = gfx_v12_0_ring_emit_reg_write_reg_wait,

0 commit comments

Comments
 (0)