diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 18 |
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 ab9c65a245ba..78713ae3b158 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |||
@@ -372,16 +372,16 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev, | |||
372 | if (amdgpu_enable_scheduler) { | 372 | if (amdgpu_enable_scheduler) { |
373 | int r; | 373 | int r; |
374 | sched_job = amdgpu_cs_parser_create(adev, AMDGPU_FENCE_OWNER_VM, | 374 | sched_job = amdgpu_cs_parser_create(adev, AMDGPU_FENCE_OWNER_VM, |
375 | adev->kernel_ctx, ib, 1); | 375 | &adev->kernel_ctx, ib, 1); |
376 | if(!sched_job) | 376 | if(!sched_job) |
377 | goto error_free; | 377 | goto error_free; |
378 | sched_job->job_param.vm.bo = bo; | 378 | sched_job->job_param.vm.bo = bo; |
379 | sched_job->run_job = amdgpu_vm_run_job; | 379 | sched_job->run_job = amdgpu_vm_run_job; |
380 | sched_job->free_job = amdgpu_vm_free_job; | 380 | sched_job->free_job = amdgpu_vm_free_job; |
381 | ib->sequence = amd_sched_push_job(ring->scheduler, | 381 | ib->sequence = amd_sched_push_job(ring->scheduler, |
382 | &adev->kernel_ctx->rings[ring->idx].c_entity, | 382 | &adev->kernel_ctx.rings[ring->idx].c_entity, |
383 | sched_job); | 383 | sched_job); |
384 | r = amd_sched_wait_emit(&adev->kernel_ctx->rings[ring->idx].c_entity, | 384 | r = amd_sched_wait_emit(&adev->kernel_ctx.rings[ring->idx].c_entity, |
385 | ib->sequence, false, -1); | 385 | ib->sequence, false, -1); |
386 | if (r) | 386 | if (r) |
387 | DRM_ERROR("emit timeout\n"); | 387 | DRM_ERROR("emit timeout\n"); |
@@ -517,7 +517,7 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, | |||
517 | if (amdgpu_enable_scheduler) { | 517 | if (amdgpu_enable_scheduler) { |
518 | int r; | 518 | int r; |
519 | sched_job = amdgpu_cs_parser_create(adev, AMDGPU_FENCE_OWNER_VM, | 519 | sched_job = amdgpu_cs_parser_create(adev, AMDGPU_FENCE_OWNER_VM, |
520 | adev->kernel_ctx, | 520 | &adev->kernel_ctx, |
521 | ib, 1); | 521 | ib, 1); |
522 | if(!sched_job) | 522 | if(!sched_job) |
523 | goto error_free; | 523 | goto error_free; |
@@ -525,9 +525,9 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, | |||
525 | sched_job->run_job = amdgpu_vm_run_job; | 525 | sched_job->run_job = amdgpu_vm_run_job; |
526 | sched_job->free_job = amdgpu_vm_free_job; | 526 | sched_job->free_job = amdgpu_vm_free_job; |
527 | ib->sequence = amd_sched_push_job(ring->scheduler, | 527 | ib->sequence = amd_sched_push_job(ring->scheduler, |
528 | &adev->kernel_ctx->rings[ring->idx].c_entity, | 528 | &adev->kernel_ctx.rings[ring->idx].c_entity, |
529 | sched_job); | 529 | sched_job); |
530 | r = amd_sched_wait_emit(&adev->kernel_ctx->rings[ring->idx].c_entity, | 530 | r = amd_sched_wait_emit(&adev->kernel_ctx.rings[ring->idx].c_entity, |
531 | ib->sequence, false, -1); | 531 | ib->sequence, false, -1); |
532 | if (r) | 532 | if (r) |
533 | DRM_ERROR("emit timeout\n"); | 533 | DRM_ERROR("emit timeout\n"); |
@@ -863,7 +863,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, | |||
863 | if (amdgpu_enable_scheduler) { | 863 | if (amdgpu_enable_scheduler) { |
864 | int r; | 864 | int r; |
865 | sched_job = amdgpu_cs_parser_create(adev, AMDGPU_FENCE_OWNER_VM, | 865 | sched_job = amdgpu_cs_parser_create(adev, AMDGPU_FENCE_OWNER_VM, |
866 | adev->kernel_ctx, ib, 1); | 866 | &adev->kernel_ctx, ib, 1); |
867 | if(!sched_job) | 867 | if(!sched_job) |
868 | goto error_free; | 868 | goto error_free; |
869 | sched_job->job_param.vm_mapping.vm = vm; | 869 | sched_job->job_param.vm_mapping.vm = vm; |
@@ -873,9 +873,9 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, | |||
873 | sched_job->run_job = amdgpu_vm_bo_update_mapping_run_job; | 873 | sched_job->run_job = amdgpu_vm_bo_update_mapping_run_job; |
874 | sched_job->free_job = amdgpu_vm_free_job; | 874 | sched_job->free_job = amdgpu_vm_free_job; |
875 | ib->sequence = amd_sched_push_job(ring->scheduler, | 875 | ib->sequence = amd_sched_push_job(ring->scheduler, |
876 | &adev->kernel_ctx->rings[ring->idx].c_entity, | 876 | &adev->kernel_ctx.rings[ring->idx].c_entity, |
877 | sched_job); | 877 | sched_job); |
878 | r = amd_sched_wait_emit(&adev->kernel_ctx->rings[ring->idx].c_entity, | 878 | r = amd_sched_wait_emit(&adev->kernel_ctx.rings[ring->idx].c_entity, |
879 | ib->sequence, false, -1); | 879 | ib->sequence, false, -1); |
880 | if (r) | 880 | if (r) |
881 | DRM_ERROR("emit timeout\n"); | 881 | DRM_ERROR("emit timeout\n"); |