drm/amdgpu: drop redundant check of harvest info

Harvest bit setting in IP data structure promises this,
so no need to set it explicitly.

Signed-off-by: Guchun Chen <guchun.chen@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_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index e4fcbb385a62b6613d176b8209a2194fed6b421d..5a182288391b5524221749f51421ab8c70b926f4 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1150,13 +1150,6 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev)
                adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK;
                adev->harvest_ip_mask |= AMD_HARVEST_IP_JPEG_MASK;
        }
-       if ((adev->pdev->device == 0x731E &&
-            (adev->pdev->revision == 0xC6 || adev->pdev->revision == 0xC7)) ||
-           (adev->pdev->device == 0x7340 && adev->pdev->revision == 0xC9)  ||
-           (adev->pdev->device == 0x7360 && adev->pdev->revision == 0xC7)) {
-               adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK;
-               adev->harvest_ip_mask |= AMD_HARVEST_IP_JPEG_MASK;
-       }
 }
 
 union gc_info {