aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorLeo Liu <leo.liu@amd.com>2017-02-21 11:24:09 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-05-24 17:41:45 -0400
commitf93aa00c0bdc85ebd9ace72e34997cf4ba56e839 (patch)
tree8b1aa5781f4b3ebcbc929440666f87ff17374143 /drivers/gpu
parentcefbc5989f63d37a8cafc6ccf198d67075aa914b (diff)
drm/amdgpu: get cs support for AMDGPU_HW_IP_VCN_ENC
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')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 60948a7bd247..1375a896e87b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -94,6 +94,15 @@ int amdgpu_cs_get_ring(struct amdgpu_device *adev, u32 ip_type,
94 case AMDGPU_HW_IP_VCN_DEC: 94 case AMDGPU_HW_IP_VCN_DEC:
95 *out_ring = &adev->vcn.ring_dec; 95 *out_ring = &adev->vcn.ring_dec;
96 break; 96 break;
97 case AMDGPU_HW_IP_VCN_ENC:
98 if (ring < adev->vcn.num_enc_rings){
99 *out_ring = &adev->vcn.ring_enc[ring];
100 } else {
101 DRM_ERROR("only %d VCN ENC rings are supported\n",
102 adev->vcn.num_enc_rings);
103 return -EINVAL;
104 }
105 break;
97 } 106 }
98 107
99 if (!(*out_ring && (*out_ring)->adev)) { 108 if (!(*out_ring && (*out_ring)->adev)) {