From 8047266443ce86bf0abef2db6be78f7ce550dd7a Mon Sep 17 00:00:00 2001
From: James Zhu <James.Zhu@amd.com>
Date: Tue, 22 Oct 2019 10:40:45 -0400
Subject: drm/amdgpu/vcn: Enable VCN2.5 encoding
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Git-commit: 8047266443ce86bf0abef2db6be78f7ce550dd7a
Patch-mainline: v5.5-rc1
References: bsc#1152472
After VCN2.5 firmware (Version ENC: 1.1 Revision: 11),
VCN2.5 encoding can work properly.
Signed-off-by: James Zhu <James.Zhu@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
index b3623ed3dc42..03083e5f731a 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
@@ -265,9 +265,6 @@ static int vcn_v2_5_hw_init(void *handle)
for (i = 0; i < adev->vcn.num_enc_rings; ++i) {
ring = &adev->vcn.inst[j].ring_enc[i];
- /* disable encode rings till the robustness of the FW */
- ring->sched.ready = false;
- continue;
r = amdgpu_ring_test_helper(ring);
if (r)
goto done;
--
2.28.0