aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
index befc09b68543..190e28cb827e 100644
--- 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)
121 121
122static int amdgpu_lru_map(struct amdgpu_device *adev, 122static int amdgpu_lru_map(struct amdgpu_device *adev,
123 struct amdgpu_queue_mapper *mapper, 123 struct amdgpu_queue_mapper *mapper,
124 int user_ring, 124 int user_ring, bool lru_pipe_order,
125 struct amdgpu_ring **out_ring) 125 struct amdgpu_ring **out_ring)
126{ 126{
127 int r, i, j; 127 int r, i, j;
@@ -139,7 +139,7 @@ static int amdgpu_lru_map(struct amdgpu_device *adev,
139 } 139 }
140 140
141 r = amdgpu_ring_lru_get(adev, ring_type, ring_blacklist, 141 r = amdgpu_ring_lru_get(adev, ring_type, ring_blacklist,
142 j, out_ring); 142 j, lru_pipe_order, out_ring);
143 if (r) 143 if (r)
144 return r; 144 return r;
145 145
@@ -284,8 +284,10 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev,
284 r = amdgpu_identity_map(adev, mapper, ring, out_ring); 284 r = amdgpu_identity_map(adev, mapper, ring, out_ring);
285 break; 285 break;
286 case AMDGPU_HW_IP_DMA: 286 case AMDGPU_HW_IP_DMA:
287 r = amdgpu_lru_map(adev, mapper, ring, false, out_ring);
288 break;
287 case AMDGPU_HW_IP_COMPUTE: 289 case AMDGPU_HW_IP_COMPUTE:
288 r = amdgpu_lru_map(adev, mapper, ring, out_ring); 290 r = amdgpu_lru_map(adev, mapper, ring, true, out_ring);
289 break; 291 break;
290 default: 292 default:
291 *out_ring = NULL; 293 *out_ring = NULL;