aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-02-01 06:02:08 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-02-10 14:17:22 -0500
commita0332b56f6e03e15946fb9d8813cfe44aeeb0e6c (patch)
tree8e698f71b13e44524145b520de9eb0dc9522b21e /drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
parentec72b8006c1e69f633e3def3e3b3c7c6318d271c (diff)
drm/amdgpu: send SDMA/GFX IB tests directly to the ring again
There is no point in sending them through the scheduler. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index dbfa895c2ae5..4a7708541723 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -709,9 +709,7 @@ static int gfx_v8_0_ring_test_ib(struct amdgpu_ring *ring)
709 ib.ptr[2] = 0xDEADBEEF; 709 ib.ptr[2] = 0xDEADBEEF;
710 ib.length_dw = 3; 710 ib.length_dw = 3;
711 711
712 r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL, 712 r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f);
713 AMDGPU_FENCE_OWNER_UNDEFINED,
714 &f);
715 if (r) 713 if (r)
716 goto err2; 714 goto err2;
717 715
@@ -1266,9 +1264,7 @@ static int gfx_v8_0_do_edc_gpr_workarounds(struct amdgpu_device *adev)
1266 ib.ptr[ib.length_dw++] = EVENT_TYPE(7) | EVENT_INDEX(4); 1264 ib.ptr[ib.length_dw++] = EVENT_TYPE(7) | EVENT_INDEX(4);
1267 1265
1268 /* shedule the ib on the ring */ 1266 /* shedule the ib on the ring */
1269 r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL, 1267 r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f);
1270 AMDGPU_FENCE_OWNER_UNDEFINED,
1271 &f);
1272 if (r) { 1268 if (r) {
1273 DRM_ERROR("amdgpu: ib submit failed (%d).\n", r); 1269 DRM_ERROR("amdgpu: ib submit failed (%d).\n", r);
1274 goto fail; 1270 goto fail;