aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMonk Liu <Monk.Liu@amd.com>2017-02-06 03:34:04 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-03-29 23:52:43 -0400
commitbffa2280bac6a76234f36e7d1459c474886c2244 (patch)
treea0588805d691238fc1c4e12d5a7c0299a6c3dadc
parent283caf78d38f516000f1b21d26606c4d911073d2 (diff)
drm/amdgpu:no need use sriov vf checks
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>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index ea3db70d71d2..41c4954ac85b 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -1379,11 +1379,9 @@ static int gfx_v8_0_kiq_init_ring(struct amdgpu_device *adev,
1379{ 1379{
1380 int r = 0; 1380 int r = 0;
1381 1381
1382 if (amdgpu_sriov_vf(adev)) { 1382 r = amdgpu_wb_get(adev, &adev->virt.reg_val_offs);
1383 r = amdgpu_wb_get(adev, &adev->virt.reg_val_offs); 1383 if (r)
1384 if (r) 1384 return r;
1385 return r;
1386 }
1387 1385
1388 ring->adev = NULL; 1386 ring->adev = NULL;
1389 ring->ring_obj = NULL; 1387 ring->ring_obj = NULL;
@@ -1407,13 +1405,10 @@ static int gfx_v8_0_kiq_init_ring(struct amdgpu_device *adev,
1407 1405
1408 return r; 1406 return r;
1409} 1407}
1410
1411static void gfx_v8_0_kiq_free_ring(struct amdgpu_ring *ring, 1408static void gfx_v8_0_kiq_free_ring(struct amdgpu_ring *ring,
1412 struct amdgpu_irq_src *irq) 1409 struct amdgpu_irq_src *irq)
1413{ 1410{
1414 if (amdgpu_sriov_vf(ring->adev)) 1411 amdgpu_wb_free(ring->adev, ring->adev->virt.reg_val_offs);
1415 amdgpu_wb_free(ring->adev, ring->adev->virt.reg_val_offs);
1416
1417 amdgpu_ring_fini(ring); 1412 amdgpu_ring_fini(ring);
1418 irq->data = NULL; 1413 irq->data = NULL;
1419} 1414}