aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
index 8af16e81c7d4..ea9850c9224d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
@@ -96,6 +96,9 @@ static int amdgpu_identity_map(struct amdgpu_device *adev,
96 case AMDGPU_HW_IP_VCN_ENC: 96 case AMDGPU_HW_IP_VCN_ENC:
97 *out_ring = &adev->vcn.ring_enc[ring]; 97 *out_ring = &adev->vcn.ring_enc[ring];
98 break; 98 break;
99 case AMDGPU_HW_IP_VCN_JPEG:
100 *out_ring = &adev->vcn.ring_jpeg;
101 break;
99 default: 102 default:
100 *out_ring = NULL; 103 *out_ring = NULL;
101 DRM_ERROR("unknown HW IP type: %d\n", mapper->hw_ip); 104 DRM_ERROR("unknown HW IP type: %d\n", mapper->hw_ip);
@@ -260,6 +263,9 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev,
260 case AMDGPU_HW_IP_VCN_ENC: 263 case AMDGPU_HW_IP_VCN_ENC:
261 ip_num_rings = adev->vcn.num_enc_rings; 264 ip_num_rings = adev->vcn.num_enc_rings;
262 break; 265 break;
266 case AMDGPU_HW_IP_VCN_JPEG:
267 ip_num_rings = 1;
268 break;
263 default: 269 default:
264 DRM_DEBUG("unknown ip type: %d\n", hw_ip); 270 DRM_DEBUG("unknown ip type: %d\n", hw_ip);
265 return -EINVAL; 271 return -EINVAL;
@@ -287,6 +293,7 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev,
287 case AMDGPU_HW_IP_UVD_ENC: 293 case AMDGPU_HW_IP_UVD_ENC:
288 case AMDGPU_HW_IP_VCN_DEC: 294 case AMDGPU_HW_IP_VCN_DEC:
289 case AMDGPU_HW_IP_VCN_ENC: 295 case AMDGPU_HW_IP_VCN_ENC:
296 case AMDGPU_HW_IP_VCN_JPEG:
290 r = amdgpu_identity_map(adev, mapper, ring, out_ring); 297 r = amdgpu_identity_map(adev, mapper, ring, out_ring);
291 break; 298 break;
292 case AMDGPU_HW_IP_DMA: 299 case AMDGPU_HW_IP_DMA: