diff options
| author | Chunming Zhou <david1.zhou@amd.com> | 2015-08-14 14:55:27 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-17 16:51:21 -0400 |
| commit | c3b95d4f9e460704e184ded7af60b9c4898f6181 (patch) | |
| tree | 343a8d9413a86d22c9f30f4693e15ad2ceba1bef /drivers/gpu/drm | |
| parent | 1c8f805af9af445a42b8dbda5f620752996cba44 (diff) | |
| download | blackbird-op-linux-c3b95d4f9e460704e184ded7af60b9c4898f6181.tar.gz blackbird-op-linux-c3b95d4f9e460704e184ded7af60b9c4898f6181.zip | |
drm/amdgpu: move prepare work out of scheduler to cs_ioctl
Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Christian K?nig <christian.koenig@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 07e3380ee0f2..11edac725210 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -533,12 +533,6 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error, bo amdgpu_cs_parser_fini_late(parser); } -static int amdgpu_cs_parser_run_job(struct amdgpu_cs_parser *sched_job) -{ - amdgpu_cs_parser_fini_early(sched_job, 0, true); - return 0; -} - static int amdgpu_cs_parser_free_job(struct amdgpu_cs_parser *sched_job) { amdgpu_cs_parser_fini_late(sched_job); @@ -904,14 +898,10 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) if (amdgpu_enable_scheduler && parser->num_ibs) { struct amdgpu_ring * ring = amdgpu_cs_parser_get_ring(adev, parser); - if (ring->is_pte_ring || (parser->bo_list && parser->bo_list->has_userptr)) { - r = amdgpu_cs_parser_prepare_job(parser); - if (r) - goto out; - } else - parser->prepare_job = amdgpu_cs_parser_prepare_job; + r = amdgpu_cs_parser_prepare_job(parser); + if (r) + goto out; parser->ring = ring; - parser->run_job = amdgpu_cs_parser_run_job; parser->free_job = amdgpu_cs_parser_free_job; mutex_lock(&parser->job_lock); r = amd_sched_push_job(ring->scheduler, @@ -927,6 +917,11 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) &parser->s_fence->base, parser->s_fence->v_seq); cs->out.handle = parser->s_fence->v_seq; + list_sort(NULL, &parser->validated, cmp_size_smaller_first); + ttm_eu_fence_buffer_objects(&parser->ticket, + &parser->validated, + &parser->s_fence->base); + mutex_unlock(&parser->job_lock); up_read(&adev->exclusive_lock); return 0; |
