aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
index 5724a81fbf5e..af1a3dabd190 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
@@ -27,42 +27,42 @@
27#include <drm/drmP.h> 27#include <drm/drmP.h>
28#include "amdgpu.h" 28#include "amdgpu.h"
29 29
30static struct fence *amdgpu_sched_dependency(struct amd_sched_job *job) 30static struct fence *amdgpu_sched_dependency(struct amd_sched_job *sched_job)
31{ 31{
32 struct amdgpu_job *sched_job = (struct amdgpu_job *)job; 32 struct amdgpu_job *job = (struct amdgpu_job *)sched_job;
33 return amdgpu_sync_get_fence(&sched_job->ibs->sync); 33 return amdgpu_sync_get_fence(&job->ibs->sync);
34} 34}
35 35
36static struct fence *amdgpu_sched_run_job(struct amd_sched_job *job) 36static struct fence *amdgpu_sched_run_job(struct amd_sched_job *sched_job)
37{ 37{
38 struct amdgpu_fence *fence = NULL; 38 struct amdgpu_fence *fence = NULL;
39 struct amdgpu_job *sched_job; 39 struct amdgpu_job *job;
40 int r; 40 int r;
41 41
42 if (!job) { 42 if (!sched_job) {
43 DRM_ERROR("job is null\n"); 43 DRM_ERROR("job is null\n");
44 return NULL; 44 return NULL;
45 } 45 }
46 sched_job = (struct amdgpu_job *)job; 46 job = (struct amdgpu_job *)sched_job;
47 mutex_lock(&sched_job->job_lock); 47 mutex_lock(&job->job_lock);
48 r = amdgpu_ib_schedule(sched_job->adev, 48 r = amdgpu_ib_schedule(job->adev,
49 sched_job->num_ibs, 49 job->num_ibs,
50 sched_job->ibs, 50 job->ibs,
51 sched_job->base.owner); 51 job->base.owner);
52 if (r) { 52 if (r) {
53 DRM_ERROR("Error scheduling IBs (%d)\n", r); 53 DRM_ERROR("Error scheduling IBs (%d)\n", r);
54 goto err; 54 goto err;
55 } 55 }
56 56
57 fence = amdgpu_fence_ref(sched_job->ibs[sched_job->num_ibs - 1].fence); 57 fence = amdgpu_fence_ref(job->ibs[job->num_ibs - 1].fence);
58 58
59err: 59err:
60 if (sched_job->free_job) 60 if (job->free_job)
61 sched_job->free_job(sched_job); 61 job->free_job(job);
62 62
63 mutex_unlock(&sched_job->job_lock); 63 mutex_unlock(&job->job_lock);
64 fence_put(&sched_job->base.s_fence->base); 64 fence_put(&job->base.s_fence->base);
65 kfree(sched_job); 65 kfree(job);
66 return fence ? &fence->base : NULL; 66 return fence ? &fence->base : NULL;
67} 67}
68 68