Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-next

Last set of features for 4.15.  Highlights:
- Add a bo flag to allow buffers to opt out of implicit sync
- Add ctx priority setting interface
- Lots more powerplay cleanups
- Start to plumb through vram lost infrastructure for gpu reset
- ttm support for huge pages
- misc cleanups and bug fixes

* 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux: (73 commits)
  drm/amd/powerplay: Place the constant on the right side of the test
  drm/amd/powerplay: Remove useless variable
  drm/amd/powerplay: Don't cast kzalloc() return value
  drm/amdgpu: allow GTT overcommit during bind
  drm/amdgpu: linear validate first then bind to GART
  drm/amd/pp: Fix overflow when setup decf/pix/disp dpm table.
  drm/amd/pp: thermal control not enabled on vega10.
  drm/amdgpu: busywait KIQ register accessing (v4)
  drm/amdgpu: report more amdgpu_fence_info
  drm/amdgpu:don't check soft_reset for sriov
  drm/amdgpu:fix duplicated setting job's vram_lost
  drm/amdgpu:reduce wb to 512 slot
  drm/amdgpu: fix regresstion on SR-IOV gpu reset failed
  drm/amd/powerplay: Tidy up cz_dpm_powerup_vce()
  drm/amd/powerplay: Tidy up cz_dpm_powerdown_vce()
  drm/amd/powerplay: Tidy up cz_dpm_update_vce_dpm()
  drm/amd/powerplay: Tidy up cz_dpm_update_uvd_dpm()
  drm/amd/powerplay: Tidy up cz_dpm_powerup_uvd()
  drm/amd/powerplay: Tidy up cz_dpm_powerdown_uvd()
  drm/amd/powerplay: Tidy up cz_start_dpm()
  ...

1 files changed, 75 insertions, 1 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index 019932a7ea3a..e5ece1fae149 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -155,6 +155,75 @@ void amdgpu_ring_undo(struct amdgpu_ring *ring)
 }
 
 /**
+ * amdgpu_ring_priority_put - restore a ring's priority
+ *
+ * @ring: amdgpu_ring structure holding the information
+ * @priority: target priority
+ *
+ * Release a request for executing at @priority
+ */
+void amdgpu_ring_priority_put(struct amdgpu_ring *ring,
+                              enum amd_sched_priority priority)
+{
+        int i;
+
+        if (!ring->funcs->set_priority)
+                return;
+
+        if (atomic_dec_return(&ring->num_jobs[priority]) > 0)
+                return;
+
+        /* no need to restore if the job is already at the lowest priority */
+        if (priority == AMD_SCHED_PRIORITY_NORMAL)
+                return;
+
+        mutex_lock(&ring->priority_mutex);
+        /* something higher prio is executing, no need to decay */
+        if (ring->priority > priority)
+                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
+                                || atomic_read(&ring->num_jobs[i])) {
+                        ring->priority = i;
+                        ring->funcs->set_priority(ring, i);
+                        break;
+                }
+        }
+
+out_unlock:
+        mutex_unlock(&ring->priority_mutex);
+}
+
+/**
+ * amdgpu_ring_priority_get - change the ring's priority
+ *
+ * @ring: amdgpu_ring structure holding the information
+ * @priority: target priority
+ *
+ * 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)
+{
+        if (!ring->funcs->set_priority)
+                return;
+
+        atomic_inc(&ring->num_jobs[priority]);
+
+        mutex_lock(&ring->priority_mutex);
+        if (priority <= ring->priority)
+                goto out_unlock;
+
+        ring->priority = priority;
+        ring->funcs->set_priority(ring, priority);
+
+out_unlock:
+        mutex_unlock(&ring->priority_mutex);
+}
+
+/**
  * amdgpu_ring_init - init driver ring struct.
  *
  * @adev: amdgpu_device pointer
@@ -169,7 +238,7 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
                      unsigned max_dw, struct amdgpu_irq_src *irq_src,
                      unsigned irq_type)
 {
-        int r;
+        int r, i;
         int sched_hw_submission = amdgpu_sched_hw_submission;
 
         /* Set the hw submission limit higher for KIQ because
@@ -247,9 +316,14 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
         }
 
         ring->max_dw = max_dw;
+        ring->priority = AMD_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)
+                atomic_set(&ring->num_jobs[i], 0);
+
         if (amdgpu_debugfs_ring_init(adev, ring)) {
                 DRM_ERROR("Failed to register debugfs file for rings !\n");
         }