Commit a3d686a6 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu: don't use kiq to flush gpu tlb if mes enabled 



If MES is enabled, don't use kiq to flush gpu tlb,
for it would result in conflicting with mes fw.

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 15d839c1

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

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static void gmc_v10_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, 
	/* For SRIOV run time, driver shouldn't access the register through MMIO

	 * Directly use kiq to do the vm invalidation instead

	 */

	if (adev->gfx.kiq.ring.sched.ready &&

	if (adev->gfx.kiq.ring.sched.ready && !adev->enable_mes &&

	    (amdgpu_sriov_runtime(adev) || !amdgpu_sriov_vf(adev)) &&

	    down_read_trylock(&adev->reset_domain->sem)) {

		struct amdgpu_vmhub *hub = &adev->vmhub[vmhub];