Commit 52c293ab authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Populate VCN/JPEG harvest information 



Certain instances of VCN/JPEG IPs may not be usable. Fetch the information
from harvest table.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d839a158

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

+4 −4
Original line number Diff line number Diff line
@@ -563,10 +563,10 @@ static void amdgpu_discovery_read_from_harvest_table(struct amdgpu_device *adev, 
		switch (le16_to_cpu(harvest_info->list[i].hw_id)) {

		case VCN_HWID:

			(*vcn_harvest_count)++;

			if (harvest_info->list[i].number_instance == 0)

				adev->vcn.harvest_config |= AMDGPU_VCN_HARVEST_VCN0;

			else

				adev->vcn.harvest_config |= AMDGPU_VCN_HARVEST_VCN1;

			adev->vcn.harvest_config |=

				(1 << harvest_info->list[i].number_instance);

			adev->jpeg.harvest_config |=

				(1 << harvest_info->list[i].number_instance);

			break;

		case DMU_HWID:

			adev->harvest_ip_mask |= AMD_HARVEST_IP_DMU_MASK;