Skip to content

Commit 80d8a9a

Browse files
Yifan Zhaalexdeucher
authored andcommitted
drm/amdgpu: Skip emit de meta data on gfx11 with rs64 enabled
[Why] Accoreding to CP updated to RS64 on gfx11, WRITE_DATA with PREEMPTION_META_MEMORY(dst_sel=8) is illegal for CP FW. That packet is used for MCBP on F32 based system. So it would lead to incorrect GRBM write and FW is not handling that extra case correctly. [How] With gfx11 rs64 enabled, skip emit de meta data. Signed-off-by: Yifan Zha <Yifan.Zha@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 8366cd4) Cc: stable@vger.kernel.org
1 parent 31ab314 commit 80d8a9a

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5872,9 +5872,9 @@ static void gfx_v11_0_ring_emit_ib_gfx(struct amdgpu_ring *ring,
58725872
if (flags & AMDGPU_IB_PREEMPTED)
58735873
control |= INDIRECT_BUFFER_PRE_RESUME(1);
58745874

5875-
if (vmid)
5875+
if (vmid && !ring->adev->gfx.rs64_enable)
58765876
gfx_v11_0_ring_emit_de_meta(ring,
5877-
(!amdgpu_sriov_vf(ring->adev) && flags & AMDGPU_IB_PREEMPTED) ? true : false);
5877+
!amdgpu_sriov_vf(ring->adev) && (flags & AMDGPU_IB_PREEMPTED));
58785878
}
58795879

58805880
amdgpu_ring_write(ring, header);

0 commit comments

Comments
 (0)