Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
index befc09b68543cf3de83116f04d20f99284a0fcc7..190e28cb827e535d247377e731507a82bc20dc3a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
@@ -121,7 +121,7 @@ static enum amdgpu_ring_type amdgpu_hw_ip_to_ring_type(int hw_ip)
 
 static int amdgpu_lru_map(struct amdgpu_device *adev,
                          struct amdgpu_queue_mapper *mapper,
 
 static int amdgpu_lru_map(struct amdgpu_device *adev,
                          struct amdgpu_queue_mapper *mapper,

-                         int user_ring,
+                         int user_ring, bool lru_pipe_order,

                          struct amdgpu_ring **out_ring)
 {
        int r, i, j;
                          struct amdgpu_ring **out_ring)
 {
        int r, i, j;


@@ -139,7 +139,7 @@ static int amdgpu_lru_map(struct amdgpu_device *adev,
        }
 
        r = amdgpu_ring_lru_get(adev, ring_type, ring_blacklist,
        }
 
        r = amdgpu_ring_lru_get(adev, ring_type, ring_blacklist,

-                               j, out_ring);
+                               j, lru_pipe_order, out_ring);

        if (r)
                return r;
 
        if (r)
                return r;
 


@@ -284,8 +284,10 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev,
                r = amdgpu_identity_map(adev, mapper, ring, out_ring);
                break;
        case AMDGPU_HW_IP_DMA:
                r = amdgpu_identity_map(adev, mapper, ring, out_ring);
                break;
        case AMDGPU_HW_IP_DMA:

+               r = amdgpu_lru_map(adev, mapper, ring, false, out_ring);
+               break;

        case AMDGPU_HW_IP_COMPUTE:
        case AMDGPU_HW_IP_COMPUTE:

-               r = amdgpu_lru_map(adev, mapper, ring, out_ring);
+               r = amdgpu_lru_map(adev, mapper, ring, true, out_ring);

                break;
        default:
                *out_ring = NULL;
                break;
        default:
                *out_ring = NULL;