drm/amdgpu: add AMDGPU_HW_IP_VCN_ENC to info query
authorLeo Liu <leo.liu@amd.com>
Tue, 21 Feb 2017 16:23:28 +0000 (11:23 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 24 May 2017 21:41:44 +0000 (17:41 -0400)
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>
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

index 1a77893fa5f32bb900c1ddf007f46bfaa4f41069..62f0a9591bb5932f32a929bf7912fb93ba6a11b3 100644 (file)
@@ -325,6 +325,13 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
                        ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
                        ib_size_alignment = 16;
                        break;
+               case AMDGPU_HW_IP_VCN_ENC:
+                       type = AMD_IP_BLOCK_TYPE_VCN;
+                       for (i = 0; i < adev->vcn.num_enc_rings; i++)
+                               ring_mask |= ((adev->vcn.ring_enc[i].ready ? 1 : 0) << i);
+                       ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
+                       ib_size_alignment = 1;
+                       break;
                default:
                        return -EINVAL;
                }
@@ -368,6 +375,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
                        type = AMD_IP_BLOCK_TYPE_UVD;
                        break;
                case AMDGPU_HW_IP_VCN_DEC:
+               case AMDGPU_HW_IP_VCN_ENC:
                        type = AMD_IP_BLOCK_TYPE_VCN;
                        break;
                default: