diff options
| author | Jammy Zhou <Jammy.Zhou@amd.com> | 2015-07-30 17:19:52 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-17 16:50:56 -0400 |
| commit | dd01d071957ded58d9bae3d3bf6061ada1d84692 (patch) | |
| tree | aac4e337038a02579763b45e7e3e726113bf6a40 /drivers | |
| parent | 03d3a3e634894259a27979f4a372273162611e78 (diff) | |
drm/amdgpu: some code refinement v2
Fix the code alignment, etc.
v2: rebase the code
Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 26 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 9 |
2 files changed, 18 insertions, 17 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index aee59110735f..fda7792d9e08 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -817,14 +817,14 @@ static int amdgpu_cs_dependencies(struct amdgpu_device *adev, static int amdgpu_cs_parser_prepare_job(struct amdgpu_cs_parser *sched_job) { - int r, i; + int r, i; struct amdgpu_cs_parser *parser = sched_job; struct amdgpu_device *adev = sched_job->adev; - bool reserved_buffers = false; + bool reserved_buffers = false; - r = amdgpu_cs_parser_relocs(parser); - if (r) { - if (r != -ERESTARTSYS) { + r = amdgpu_cs_parser_relocs(parser); + if (r) { + if (r != -ERESTARTSYS) { if (r == -ENOMEM) DRM_ERROR("Not enough memory for command submission!\n"); else @@ -841,16 +841,16 @@ static int amdgpu_cs_parser_prepare_job(struct amdgpu_cs_parser *sched_job) if (r) DRM_ERROR("Failed in the dependencies handling %d!\n", r); } - if (r) { - amdgpu_cs_parser_fini(parser, r, reserved_buffers); - return r; - } + if (r) { + amdgpu_cs_parser_fini(parser, r, reserved_buffers); + return r; + } - for (i = 0; i < parser->num_ibs; i++) - trace_amdgpu_cs(parser, i); + for (i = 0; i < parser->num_ibs; i++) + trace_amdgpu_cs(parser, i); - r = amdgpu_cs_ib_vm_chunk(adev, parser); - return r; + r = amdgpu_cs_ib_vm_chunk(adev, parser); + return r; } static struct amdgpu_ring *amdgpu_cs_parser_get_ring( diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c index 0f55c05c80b1..788dd348a650 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c @@ -33,11 +33,12 @@ static int amdgpu_sched_prepare_job(struct amd_gpu_scheduler *sched, { int r = 0; struct amdgpu_cs_parser *sched_job = (struct amdgpu_cs_parser *)job; - if (sched_job->prepare_job) + if (sched_job->prepare_job) { r = sched_job->prepare_job(sched_job); - if (r) { - DRM_ERROR("Prepare job error\n"); - schedule_work(&sched_job->job_work); + if (r) { + DRM_ERROR("Prepare job error\n"); + schedule_work(&sched_job->job_work); + } } return r; } |