Commit 6638391b authored by Peng Ju Zhou's avatar Peng Ju Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: Enable second VCN for certain Navy Flounder. 



Certain Navy Flounder cards have 2 VCNs, enable it.

Signed-off-by: default avatarPeng Ju Zhou <PengJu.Zhou@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 63ad5371

drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

+2 −1
Original line number Diff line number Diff line
@@ -550,7 +550,8 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev) 
	}

	/* some IP discovery tables on Navy Flounder don't have this set correctly */

	if ((adev->ip_versions[UVD_HWIP][1] == IP_VERSION(3, 0, 1)) &&

	    (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 3, 2)))

	    (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 3, 2)) &&

	    (adev->pdev->revision != 0xFF))

		adev->vcn.harvest_config |= AMDGPU_VCN_HARVEST_VCN1;

	if (vcn_harvest_count == adev->vcn.num_vcn_inst) {

		adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK;