aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
diff options
context:
space:
mode:
authorLeo Liu <leo.liu@amd.com>2017-01-10 11:50:08 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-03-29 23:53:47 -0400
commit63defd3f677ef49c4d1a8f1b40a6d6b4e743c6f9 (patch)
treeb8fa91c4836a4e8f49b545b8419eee63fafb44e0 /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
parenta50798b6c724354b80d7c5e3de2ceaf8441a831e (diff)
drm/amdgpu: add AMDGPU_HW_IP_UVD_ENC to info query
Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Leo Liu <leo.liu@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.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 099a90e98a39..ef91c8e2b8e3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -309,6 +309,13 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
309 ib_start_alignment = AMDGPU_GPU_PAGE_SIZE; 309 ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
310 ib_size_alignment = 1; 310 ib_size_alignment = 1;
311 break; 311 break;
312 case AMDGPU_HW_IP_UVD_ENC:
313 type = AMD_IP_BLOCK_TYPE_UVD;
314 for (i = 0; i < adev->uvd.num_enc_rings; i++)
315 ring_mask |= ((adev->uvd.ring_enc[i].ready ? 1 : 0) << i);
316 ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
317 ib_size_alignment = 1;
318 break;
312 default: 319 default:
313 return -EINVAL; 320 return -EINVAL;
314 } 321 }
@@ -348,6 +355,9 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
348 case AMDGPU_HW_IP_VCE: 355 case AMDGPU_HW_IP_VCE:
349 type = AMD_IP_BLOCK_TYPE_VCE; 356 type = AMD_IP_BLOCK_TYPE_VCE;
350 break; 357 break;
358 case AMDGPU_HW_IP_UVD_ENC:
359 type = AMD_IP_BLOCK_TYPE_UVD;
360 break;
351 default: 361 default:
352 return -EINVAL; 362 return -EINVAL;
353 } 363 }