Commit 822f7808 authored by Lang Yu's avatar Lang Yu Committed by Alex Deucher
Browse files

drm/amdgpu/discovery: enable UMSCH 4.0 in IP discovery 



Enable UMSCH to support VPE and VCN user queues.

Signed-off-by: default avatarLang Yu <Lang.Yu@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarVeerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4f949033

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

+18 −0
Original line number Diff line number Diff line
@@ -2160,6 +2160,20 @@ static int amdgpu_discovery_set_vpe_ip_blocks(struct amdgpu_device *adev) 
	return 0;

}



static int amdgpu_discovery_set_umsch_mm_ip_blocks(struct amdgpu_device *adev)

{

	switch (adev->ip_versions[VCN_HWIP][0]) {

	case IP_VERSION(4, 0, 5):

		amdgpu_device_ip_block_add(adev, &umsch_mm_v4_0_ip_block);

		adev->enable_umsch_mm = true;

		break;

	default:

		break;

	}



	return 0;

}



int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)

{

	int r;
@@ -2651,6 +2665,10 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev) 
	if (r)

		return r;



	r = amdgpu_discovery_set_umsch_mm_ip_blocks(adev);

	if (r)

		return r;



	return 0;

}