From: Alex Deucher <alexander.deucher@amd.com>
Date: Tue, 15 Jun 2021 21:29:44 +0000 (-0400)
Subject: drm/amdgpu/vcn3: drop extraneous Beige Goby hunk
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=26c0504ad3e0fdee808dbf458dd31d7c12469ef9;p=linux.git

drm/amdgpu/vcn3: drop extraneous Beige Goby hunk

Probably a rebase leftover.  This doesn't apply to SR-IOV, and
the non-SR-IOV code below it already handles this properly.

Reviewed-by: James Zhu <James.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
index 4c36fc5c97386..ea6487ca997a6 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
@@ -93,11 +93,6 @@ static int vcn_v3_0_early_init(void *handle)
 		adev->vcn.harvest_config = 0;
 		adev->vcn.num_enc_rings = 1;
 
-	if (adev->asic_type == CHIP_BEIGE_GOBY) {
-		adev->vcn.num_vcn_inst = 1;
-		adev->vcn.num_enc_rings = 0;
-	}
-
 	} else {
 		if (adev->asic_type == CHIP_SIENNA_CICHLID) {
 			u32 harvest;