drm/amdgpu: move setting the job resources

Move setting the job resources into amdgpu_job.c

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 6f80cf2..f7bf61d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -495,9 +495,6 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
        struct amdgpu_vm *vm = &fpriv->vm;
        struct amdgpu_bo_list_entry *e;
        struct list_head duplicates;
-       struct amdgpu_bo *gds;
-       struct amdgpu_bo *gws;
-       struct amdgpu_bo *oa;
        int r;
 
        INIT_LIST_HEAD(&p->validated);
@@ -614,22 +611,8 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
        amdgpu_cs_report_moved_bytes(p->adev, p->bytes_moved,
                                     p->bytes_moved_vis);
 
-       gds = p->bo_list->gds_obj;
-       gws = p->bo_list->gws_obj;
-       oa = p->bo_list->oa_obj;
-
-       if (gds) {
-               p->job->gds_base = amdgpu_bo_gpu_offset(gds) >> PAGE_SHIFT;
-               p->job->gds_size = amdgpu_bo_size(gds) >> PAGE_SHIFT;
-       }
-       if (gws) {
-               p->job->gws_base = amdgpu_bo_gpu_offset(gws) >> PAGE_SHIFT;
-               p->job->gws_size = amdgpu_bo_size(gws) >> PAGE_SHIFT;
-       }
-       if (oa) {
-               p->job->oa_base = amdgpu_bo_gpu_offset(oa) >> PAGE_SHIFT;
-               p->job->oa_size = amdgpu_bo_size(oa) >> PAGE_SHIFT;
-       }
+       amdgpu_job_set_resources(p->job, p->bo_list->gds_obj,
+                                p->bo_list->gws_obj, p->bo_list->oa_obj);
 
        if (!r && p->uf_entry.tv.bo) {
                struct amdgpu_bo *uf = ttm_to_amdgpu_bo(p->uf_entry.tv.bo);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index 1062b7e..877b3c2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -132,6 +132,23 @@ int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size,
        return r;
 }
 
+void amdgpu_job_set_resources(struct amdgpu_job *job, struct amdgpu_bo *gds,
+                             struct amdgpu_bo *gws, struct amdgpu_bo *oa)
+{
+       if (gds) {
+               job->gds_base = amdgpu_bo_gpu_offset(gds) >> PAGE_SHIFT;
+               job->gds_size = amdgpu_bo_size(gds) >> PAGE_SHIFT;
+       }
+       if (gws) {
+               job->gws_base = amdgpu_bo_gpu_offset(gws) >> PAGE_SHIFT;
+               job->gws_size = amdgpu_bo_size(gws) >> PAGE_SHIFT;
+       }
+       if (oa) {
+               job->oa_base = amdgpu_bo_gpu_offset(oa) >> PAGE_SHIFT;
+               job->oa_size = amdgpu_bo_size(oa) >> PAGE_SHIFT;
+       }
+}
+
 void amdgpu_job_free_resources(struct amdgpu_job *job)
 {
        struct amdgpu_ring *ring = to_amdgpu_ring(job->base.sched);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h
index babc0af..2a1961b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h
@@ -76,6 +76,8 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, unsigned num_ibs,
                     struct amdgpu_job **job, struct amdgpu_vm *vm);
 int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev, unsigned size,
                enum amdgpu_ib_pool_type pool, struct amdgpu_job **job);
+void amdgpu_job_set_resources(struct amdgpu_job *job, struct amdgpu_bo *gds,
+                             struct amdgpu_bo *gws, struct amdgpu_bo *oa);
 void amdgpu_job_free_resources(struct amdgpu_job *job);
 void amdgpu_job_free(struct amdgpu_job *job);
 int amdgpu_job_submit(struct amdgpu_job *job, struct drm_sched_entity *entity,