diff options
author | Leo Liu <leo.liu@amd.com> | 2017-02-21 11:23:28 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-05-24 17:41:44 -0400 |
commit | cefbc5989f63d37a8cafc6ccf198d67075aa914b (patch) | |
tree | b2355bd7a911f47a2578809a03fc830c8fe3c020 /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | |
parent | 25547cfd262dc0621b0743aa78471a6c8a6b1e84 (diff) |
drm/amdgpu: add AMDGPU_HW_IP_VCN_ENC to info query
Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index 1a77893fa5f3..62f0a9591bb5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | |||
@@ -325,6 +325,13 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file | |||
325 | ib_start_alignment = AMDGPU_GPU_PAGE_SIZE; | 325 | ib_start_alignment = AMDGPU_GPU_PAGE_SIZE; |
326 | ib_size_alignment = 16; | 326 | ib_size_alignment = 16; |
327 | break; | 327 | break; |
328 | case AMDGPU_HW_IP_VCN_ENC: | ||
329 | type = AMD_IP_BLOCK_TYPE_VCN; | ||
330 | for (i = 0; i < adev->vcn.num_enc_rings; i++) | ||
331 | ring_mask |= ((adev->vcn.ring_enc[i].ready ? 1 : 0) << i); | ||
332 | ib_start_alignment = AMDGPU_GPU_PAGE_SIZE; | ||
333 | ib_size_alignment = 1; | ||
334 | break; | ||
328 | default: | 335 | default: |
329 | return -EINVAL; | 336 | return -EINVAL; |
330 | } | 337 | } |
@@ -368,6 +375,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file | |||
368 | type = AMD_IP_BLOCK_TYPE_UVD; | 375 | type = AMD_IP_BLOCK_TYPE_UVD; |
369 | break; | 376 | break; |
370 | case AMDGPU_HW_IP_VCN_DEC: | 377 | case AMDGPU_HW_IP_VCN_DEC: |
378 | case AMDGPU_HW_IP_VCN_ENC: | ||
371 | type = AMD_IP_BLOCK_TYPE_VCN; | 379 | type = AMD_IP_BLOCK_TYPE_VCN; |
372 | break; | 380 | break; |
373 | default: | 381 | default: |