drm/amdgpu:no need use sriov vf checks
authorMonk Liu <Monk.Liu@amd.com>
Mon, 6 Feb 2017 08:34:04 +0000 (16:34 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 30 Mar 2017 03:52:43 +0000 (23:52 -0400)
We ultimately want to re-use this for bare metal,
so no need to have vf checks in the KIQ code itself
since kiq itself is currently only used in VF cases.

Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c

index ea3db70d71d2a3f8dea1c7fb0e1a109f7f4dfef4..41c4954ac85b9c0787a0e15b3cc0f893a17885a8 100644 (file)
@@ -1379,11 +1379,9 @@ static int gfx_v8_0_kiq_init_ring(struct amdgpu_device *adev,
 {
        int r = 0;
 
-       if (amdgpu_sriov_vf(adev)) {
-               r = amdgpu_wb_get(adev, &adev->virt.reg_val_offs);
-               if (r)
-                       return r;
-       }
+       r = amdgpu_wb_get(adev, &adev->virt.reg_val_offs);
+       if (r)
+               return r;
 
        ring->adev = NULL;
        ring->ring_obj = NULL;
@@ -1407,13 +1405,10 @@ static int gfx_v8_0_kiq_init_ring(struct amdgpu_device *adev,
 
        return r;
 }
-
 static void gfx_v8_0_kiq_free_ring(struct amdgpu_ring *ring,
                                   struct amdgpu_irq_src *irq)
 {
-       if (amdgpu_sriov_vf(ring->adev))
-               amdgpu_wb_free(ring->adev, ring->adev->virt.reg_val_offs);
-
+       amdgpu_wb_free(ring->adev, ring->adev->virt.reg_val_offs);
        amdgpu_ring_fini(ring);
        irq->data = NULL;
 }