drm/amdgpu/vcn3: drop extraneous Beige Goby hunk
authorAlex Deucher <alexander.deucher@amd.com>
Tue, 15 Jun 2021 21:29:44 +0000 (17:29 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 18 Jun 2021 21:01:35 +0000 (17:01 -0400)
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>
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c

index 4c36fc5c973861997bd1e9c8b5599c4e82998564..ea6487ca997a688c04b22c02a11024cc2a7f3753 100644 (file)
@@ -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;