drm/amdgpu: merge amd_sched_entity and amd_context_entity v2

Avoiding a couple of casts.

v2: rename c_entity to entity as well

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 9d5043c42fc5..230bf1f34ead 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -379,12 +379,12 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
                 sched_job->job_param.vm.bo = bo;
                 sched_job->run_job = amdgpu_vm_run_job;
                 sched_job->free_job = amdgpu_vm_free_job;
-                v_seq = atomic64_inc_return(&adev->kernel_ctx.rings[ring->idx].c_entity.last_queued_v_seq);
+                v_seq = atomic64_inc_return(&adev->kernel_ctx.rings[ring->idx].entity.last_queued_v_seq);
                 ib->sequence = v_seq;
                 amd_sched_push_job(ring->scheduler,
-                                   &adev->kernel_ctx.rings[ring->idx].c_entity,
+                                   &adev->kernel_ctx.rings[ring->idx].entity,
                                    sched_job);
-                r = amd_sched_wait_emit(&adev->kernel_ctx.rings[ring->idx].c_entity,
+                r = amd_sched_wait_emit(&adev->kernel_ctx.rings[ring->idx].entity,
                                         v_seq,
                                         false,
                                         -1);
@@ -530,12 +530,12 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,
                         sched_job->job_param.vm.bo = pd;
                         sched_job->run_job = amdgpu_vm_run_job;
                         sched_job->free_job = amdgpu_vm_free_job;
-                        v_seq = atomic64_inc_return(&adev->kernel_ctx.rings[ring->idx].c_entity.last_queued_v_seq);
+                        v_seq = atomic64_inc_return(&adev->kernel_ctx.rings[ring->idx].entity.last_queued_v_seq);
                         ib->sequence = v_seq;
                         amd_sched_push_job(ring->scheduler,
-                                           &adev->kernel_ctx.rings[ring->idx].c_entity,
+                                           &adev->kernel_ctx.rings[ring->idx].entity,
                                            sched_job);
-                        r = amd_sched_wait_emit(&adev->kernel_ctx.rings[ring->idx].c_entity,
+                        r = amd_sched_wait_emit(&adev->kernel_ctx.rings[ring->idx].entity,
                                                 v_seq,
                                                 false,
                                                 -1);
@@ -883,12 +883,12 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
                 sched_job->job_param.vm_mapping.fence = fence;
                 sched_job->run_job = amdgpu_vm_bo_update_mapping_run_job;
                 sched_job->free_job = amdgpu_vm_free_job;
-                v_seq = atomic64_inc_return(&adev->kernel_ctx.rings[ring->idx].c_entity.last_queued_v_seq);
+                v_seq = atomic64_inc_return(&adev->kernel_ctx.rings[ring->idx].entity.last_queued_v_seq);
                 ib->sequence = v_seq;
                 amd_sched_push_job(ring->scheduler,
-                                   &adev->kernel_ctx.rings[ring->idx].c_entity,
+                                   &adev->kernel_ctx.rings[ring->idx].entity,
                                    sched_job);
-                r = amd_sched_wait_emit(&adev->kernel_ctx.rings[ring->idx].c_entity,
+                r = amd_sched_wait_emit(&adev->kernel_ctx.rings[ring->idx].entity,
                                         v_seq,
                                         false,
                                         -1);