aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
diff options
context:
space:
mode:
authorChunming Zhou <David1.Zhou@amd.com>2016-01-14 22:25:00 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-02-10 14:16:50 -0500
commitcadf97b196a1e5b2db2606d53f77714e3e9cf4bb (patch)
tree1954976bc68547599f4ea9c29381a962c5c5d681 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
parentbe86c606b50a53b60f3591ba94dd687524f2ee21 (diff)
drm/amdgpu: clean up non-scheduler code path (v2)
Non-scheduler code is longer supported. v2: agd: rebased on upstream Signed-off-by: Chunming Zhou <David1.Zhou@amd.com> Reviewed-by: Ken Wang <Qingqing.Wang@amd.com> Reviewed-by: Monk Liu <monk.liu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 0479ad5a66ed..ddeba55c3b7d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -813,7 +813,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
813 if (r) 813 if (r)
814 goto out; 814 goto out;
815 815
816 if (amdgpu_enable_scheduler && parser.num_ibs) { 816 if (parser.num_ibs) {
817 struct amdgpu_ring * ring = parser.ibs->ring; 817 struct amdgpu_ring * ring = parser.ibs->ring;
818 struct amd_sched_fence *fence; 818 struct amd_sched_fence *fence;
819 struct amdgpu_job *job; 819 struct amdgpu_job *job;
@@ -858,15 +858,6 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
858 858
859 trace_amdgpu_cs_ioctl(job); 859 trace_amdgpu_cs_ioctl(job);
860 amd_sched_entity_push_job(&job->base); 860 amd_sched_entity_push_job(&job->base);
861
862 } else {
863 struct amdgpu_fence *fence;
864
865 r = amdgpu_ib_schedule(adev, parser.num_ibs, parser.ibs,
866 parser.filp);
867 fence = parser.ibs[parser.num_ibs - 1].fence;
868 parser.fence = fence_get(&fence->base);
869 cs->out.handle = parser.ibs[parser.num_ibs - 1].sequence;
870 } 861 }
871 862
872out: 863out: