Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_ring.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index a98fbbb4739f65dad15dc717c1e66722770b5420..13044e66dcaf4e6ab0b79fab23aef8db987170db 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -164,7 +164,7 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring)
  * Release a request for executing at @priority
  */
 void amdgpu_ring_priority_put(struct amdgpu_ring *ring,
-                             enum amd_sched_priority priority)
+                             enum drm_sched_priority priority)
 {
        int i;
 
@@ -175,7 +175,7 @@ void amdgpu_ring_priority_put(struct amdgpu_ring *ring,
                return;
 
        /* no need to restore if the job is already at the lowest priority */
-       if (priority == AMD_SCHED_PRIORITY_NORMAL)
+       if (priority == DRM_SCHED_PRIORITY_NORMAL)
                return;
 
        mutex_lock(&ring->priority_mutex);
@@ -184,8 +184,8 @@ void amdgpu_ring_priority_put(struct amdgpu_ring *ring,
                goto out_unlock;
 
        /* decay priority to the next level with a job available */
-       for (i = priority; i >= AMD_SCHED_PRIORITY_MIN; i--) {
-               if (i == AMD_SCHED_PRIORITY_NORMAL
+       for (i = priority; i >= DRM_SCHED_PRIORITY_MIN; i--) {
+               if (i == DRM_SCHED_PRIORITY_NORMAL
                                || atomic_read(&ring->num_jobs[i])) {
                        ring->priority = i;
                        ring->funcs->set_priority(ring, i);
@@ -206,7 +206,7 @@ out_unlock:
  * Request a ring's priority to be raised to @priority (refcounted).
  */
 void amdgpu_ring_priority_get(struct amdgpu_ring *ring,
-                             enum amd_sched_priority priority)
+                             enum drm_sched_priority priority)
 {
        if (!ring->funcs->set_priority)
                return;
@@ -263,25 +263,25 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
                        return r;
        }
 
-       r = amdgpu_wb_get(adev, &ring->rptr_offs);
+       r = amdgpu_device_wb_get(adev, &ring->rptr_offs);
        if (r) {
                dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);
                return r;
        }
 
-       r = amdgpu_wb_get(adev, &ring->wptr_offs);
+       r = amdgpu_device_wb_get(adev, &ring->wptr_offs);
        if (r) {
                dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r);
                return r;
        }
 
-       r = amdgpu_wb_get(adev, &ring->fence_offs);
+       r = amdgpu_device_wb_get(adev, &ring->fence_offs);
        if (r) {
                dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r);
                return r;
        }
 
-       r = amdgpu_wb_get(adev, &ring->cond_exe_offs);
+       r = amdgpu_device_wb_get(adev, &ring->cond_exe_offs);
        if (r) {
                dev_err(adev->dev, "(%d) ring cond_exec_polling wb alloc failed\n", r);
                return r;
@@ -317,12 +317,12 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
        }
 
        ring->max_dw = max_dw;
-       ring->priority = AMD_SCHED_PRIORITY_NORMAL;
+       ring->priority = DRM_SCHED_PRIORITY_NORMAL;
        mutex_init(&ring->priority_mutex);
        INIT_LIST_HEAD(&ring->lru_list);
        amdgpu_ring_lru_touch(adev, ring);
 
-       for (i = 0; i < AMD_SCHED_PRIORITY_MAX; ++i)
+       for (i = 0; i < DRM_SCHED_PRIORITY_MAX; ++i)
                atomic_set(&ring->num_jobs[i], 0);
 
        if (amdgpu_debugfs_ring_init(adev, ring)) {
@@ -348,11 +348,11 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring)
        if (!(ring->adev) || !(ring->adev->rings[ring->idx]))
                return;
 
-       amdgpu_wb_free(ring->adev, ring->rptr_offs);
-       amdgpu_wb_free(ring->adev, ring->wptr_offs);
+       amdgpu_device_wb_free(ring->adev, ring->rptr_offs);
+       amdgpu_device_wb_free(ring->adev, ring->wptr_offs);
 
-       amdgpu_wb_free(ring->adev, ring->cond_exe_offs);
-       amdgpu_wb_free(ring->adev, ring->fence_offs);
+       amdgpu_device_wb_free(ring->adev, ring->cond_exe_offs);
+       amdgpu_device_wb_free(ring->adev, ring->fence_offs);
 
        amdgpu_bo_free_kernel(&ring->ring_obj,
                              &ring->gpu_addr,