Commit 80d8a9ad authored by Yifan Zha's avatar Yifan Zha Committed by Alex Deucher
Browse files

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: default avatarYifan Zha <Yifan.Zha@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 8366cd44)
Cc: stable@vger.kernel.org
parent 31ab3143

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

+2 −2
Original line number Diff line number Diff line
@@ -5872,9 +5872,9 @@ static void gfx_v11_0_ring_emit_ib_gfx(struct amdgpu_ring *ring, 
		if (flags & AMDGPU_IB_PREEMPTED)

			control |= INDIRECT_BUFFER_PRE_RESUME(1);



		if (vmid)

		if (vmid && !ring->adev->gfx.rs64_enable)

			gfx_v11_0_ring_emit_de_meta(ring,

				    (!amdgpu_sriov_vf(ring->adev) && flags & AMDGPU_IB_PREEMPTED) ? true : false);

				!amdgpu_sriov_vf(ring->adev) && (flags & AMDGPU_IB_PREEMPTED));

	}



	amdgpu_ring_write(ring, header);