diff options
author | Jack Xiao <Jack.Xiao@amd.com> | 2022-03-31 14:17:50 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2022-05-04 10:43:49 -0400 |
commit | a3d686a6adbeb69806aa4c7a1cc338571bc423e9 (patch) | |
tree | e5d254da3d6a65c50b4f67113da3a5680d90b516 | |
parent | 15d839c16a66434c19f9c8a560b7553f9468e588 (diff) | |
download | linux-a3d686a6adbeb69806aa4c7a1cc338571bc423e9.tar.gz linux-a3d686a6adbeb69806aa4c7a1cc338571bc423e9.tar.bz2 linux-a3d686a6adbeb69806aa4c7a1cc338571bc423e9.zip |
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: Jack Xiao <Jack.Xiao@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c index 9b4a035a5bf1..b8c79789e1e4 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c @@ -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]; |