aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-09-07 12:16:49 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-09-23 17:23:37 -0400
commit9b398fa5c24eb05fc60fafd8543cc03e9170f054 (patch)
tree35491b4ccd5d981c9e3b2f6d62f8560b9ccebfee /drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
parent0f75aee75112934bcaf42410df5c51d7194b5896 (diff)
drm/amdgpu: rename fence->scheduler to sched v2
Just to be consistent with the other members. v2: rename the ring member as well. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> (v1) Reviewed-by: Chunming Zhou<david1.zhou@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 1be2bd6d07ea..8e8cd09d36c1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -626,11 +626,11 @@ void amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring)
626 ring->fence_drv.ring = ring; 626 ring->fence_drv.ring = ring;
627 627
628 if (amdgpu_enable_scheduler) { 628 if (amdgpu_enable_scheduler) {
629 ring->scheduler = amd_sched_create(&amdgpu_sched_ops, 629 ring->sched = amd_sched_create(&amdgpu_sched_ops,
630 ring->idx, 630 ring->idx,
631 amdgpu_sched_hw_submission, 631 amdgpu_sched_hw_submission,
632 (void *)ring->adev); 632 (void *)ring->adev);
633 if (!ring->scheduler) 633 if (!ring->sched)
634 DRM_ERROR("Failed to create scheduler on ring %d.\n", 634 DRM_ERROR("Failed to create scheduler on ring %d.\n",
635 ring->idx); 635 ring->idx);
636 } 636 }
@@ -681,8 +681,8 @@ void amdgpu_fence_driver_fini(struct amdgpu_device *adev)
681 wake_up_all(&ring->fence_drv.fence_queue); 681 wake_up_all(&ring->fence_drv.fence_queue);
682 amdgpu_irq_put(adev, ring->fence_drv.irq_src, 682 amdgpu_irq_put(adev, ring->fence_drv.irq_src,
683 ring->fence_drv.irq_type); 683 ring->fence_drv.irq_type);
684 if (ring->scheduler) 684 if (ring->sched)
685 amd_sched_destroy(ring->scheduler); 685 amd_sched_destroy(ring->sched);
686 ring->fence_drv.initialized = false; 686 ring->fence_drv.initialized = false;
687 } 687 }
688 mutex_unlock(&adev->ring_lock); 688 mutex_unlock(&adev->ring_lock);