Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amdgpu: remove frame cntl for gfx v12
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 5aaa5058dec5bfdcb24c42fe17ad91565a3037ca)
Cc: stable@vger.kernel.org
authored by
Likun Gao
and committed by
Alex Deucher
10343253
24d479d2
-12
-12
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
-12
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
···
278
278
u32 sh_num, u32 instance, int xcc_id);
279
279
static u32 gfx_v12_0_get_wgp_active_bitmap_per_sh(struct amdgpu_device *adev);
280
280
281
-
static void gfx_v12_0_ring_emit_frame_cntl(struct amdgpu_ring *ring, bool start, bool secure);
282
281
static void gfx_v12_0_ring_emit_wreg(struct amdgpu_ring *ring, uint32_t reg,
283
282
uint32_t val);
284
283
static int gfx_v12_0_wait_for_rlc_autoload_complete(struct amdgpu_device *adev);
···
4633
4634
return r;
4634
4635
}
4635
4636
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
-
4646
4637
static void gfx_v12_0_ring_emit_rreg(struct amdgpu_ring *ring, uint32_t reg,
4647
4638
uint32_t reg_val_offs)
4648
4639
{
···
5509
5520
.emit_cntxcntl = gfx_v12_0_ring_emit_cntxcntl,
5510
5521
.init_cond_exec = gfx_v12_0_ring_emit_init_cond_exec,
5511
5522
.preempt_ib = gfx_v12_0_ring_preempt_ib,
5512
-
.emit_frame_cntl = gfx_v12_0_ring_emit_frame_cntl,
5513
5523
.emit_wreg = gfx_v12_0_ring_emit_wreg,
5514
5524
.emit_reg_wait = gfx_v12_0_ring_emit_reg_wait,
5515
5525
.emit_reg_write_reg_wait = gfx_v12_0_ring_emit_reg_write_reg_wait,