Commit 8954c3fb authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Change AID detection logic 



On GFX 9.4.3 SOCs, only 2 SDMA instances need to be available to be
considered as a valid AID.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6e7a4176

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

+4 −2
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static int aqua_vanjaram_xcp_mgr_init(struct amdgpu_device *adev) 


int aqua_vanjaram_init_soc_config(struct amdgpu_device *adev)

{

	u32 mask, inst_mask = adev->sdma.sdma_mask;

	u32 mask, avail_inst, inst_mask = adev->sdma.sdma_mask;

	int ret, i;



	/* generally 1 AID supports 4 instances */
@@ -642,7 +642,9 @@ int aqua_vanjaram_init_soc_config(struct amdgpu_device *adev) 


	for (mask = (1 << adev->sdma.num_inst_per_aid) - 1; inst_mask;

	     inst_mask >>= adev->sdma.num_inst_per_aid, ++i) {

		if ((inst_mask & mask) == mask)

		avail_inst = inst_mask & mask;

		if (avail_inst == mask || avail_inst == 0x3 ||

		    avail_inst == 0xc)

			adev->aid_mask |= (1 << i);

	}