Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/debugfs', 'asoc...

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
index cd123306eda71202bd54c8658fa2c3978246e194..290cc3f9c433a3df7de41f1c1db228db30377ee8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
@@ -32,14 +32,14 @@
 enum amd_sched_priority amdgpu_to_sched_priority(int amdgpu_priority)
 {
        switch (amdgpu_priority) {
 enum amd_sched_priority amdgpu_to_sched_priority(int amdgpu_priority)
 {
        switch (amdgpu_priority) {

-       case AMDGPU_CTX_PRIORITY_HIGH_HW:
+       case AMDGPU_CTX_PRIORITY_VERY_HIGH:

                return AMD_SCHED_PRIORITY_HIGH_HW;
                return AMD_SCHED_PRIORITY_HIGH_HW;

-       case AMDGPU_CTX_PRIORITY_HIGH_SW:
+       case AMDGPU_CTX_PRIORITY_HIGH:

                return AMD_SCHED_PRIORITY_HIGH_SW;
        case AMDGPU_CTX_PRIORITY_NORMAL:
                return AMD_SCHED_PRIORITY_NORMAL;
                return AMD_SCHED_PRIORITY_HIGH_SW;
        case AMDGPU_CTX_PRIORITY_NORMAL:
                return AMD_SCHED_PRIORITY_NORMAL;

-       case AMDGPU_CTX_PRIORITY_LOW_SW:
-       case AMDGPU_CTX_PRIORITY_LOW_HW:
+       case AMDGPU_CTX_PRIORITY_LOW:
+       case AMDGPU_CTX_PRIORITY_VERY_LOW:

                return AMD_SCHED_PRIORITY_LOW;
        case AMDGPU_CTX_PRIORITY_UNSET:
                return AMD_SCHED_PRIORITY_UNSET;
                return AMD_SCHED_PRIORITY_LOW;
        case AMDGPU_CTX_PRIORITY_UNSET:
                return AMD_SCHED_PRIORITY_UNSET;