Remove the amdgpu_sriov_vf checking. Signed-off-by: Emily Deng <Emily.Deng at amd.com> --- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index c9b3db4..4dde406 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -4362,7 +4362,7 @@ static void gfx_v9_0_ring_emit_reg_write_reg_wait(struct amdgpu_ring *ring, fw_version_ok = (adev->asic_type == CHIP_VEGA10) ? fw_version_ok : false; - if (amdgpu_sriov_vf(adev) && fw_version_ok) + if (fw_version_ok) gfx_v9_0_wait_reg_mem(ring, usepfp, 0, 1, reg0, reg1, ref, mask, 0x20); else diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c index 3419178..4257242 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c @@ -394,11 +394,9 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, struct amdgpu_vmhub *hub = &adev->vmhub[i]; u32 tmp = gmc_v9_0_get_invalidate_req(vmid); - if (amdgpu_sriov_vf(adev) ) { - r = amdgpu_kiq_invalidate_tlb(adev, hub, eng, tmp, vmid); - if (!r) - continue; - } + r = amdgpu_kiq_invalidate_tlb(adev, hub, eng, tmp, vmid); + if (!r) + continue; WREG32_NO_KIQ(hub->vm_inv_eng0_req + eng, tmp); -- 2.7.4