From: Leo Liu <leo.liu@amd.com>
Date: Tue, 21 Feb 2017 16:24:09 +0000 (-0500)
Subject: drm/amdgpu: get cs support for AMDGPU_HW_IP_VCN_ENC
X-Git-Tag: v4.13-rc1~73^2~20^2~193
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f93aa00c0bdc85ebd9ace72e34997cf4ba56e839;p=linux.git

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>
---

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,
 	case AMDGPU_HW_IP_VCN_DEC:
 		*out_ring = &adev->vcn.ring_dec;
 		break;
+	case AMDGPU_HW_IP_VCN_ENC:
+		if (ring < adev->vcn.num_enc_rings){
+			*out_ring = &adev->vcn.ring_enc[ring];
+		} else {
+			DRM_ERROR("only %d VCN ENC rings are supported\n",
+				adev->vcn.num_enc_rings);
+			return -EINVAL;
+		}
+		break;
 	}
 
 	if (!(*out_ring && (*out_ring)->adev)) {