Commit a848986a authored by Le Ma's avatar Le Ma Committed by Alex Deucher
Browse files

drm/amdgpu: Use AMDGPU_IS_GFXHUB to screen out GFXHUB for GMC v12.1 



There're multiple gfxhubs on GMC v12.1

Signed-off-by: default avatarLe Ma <le.ma@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bb562c95

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

+3 −3
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static void gmc_v12_1_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid, 
	unsigned int i;

	unsigned char hub_ip = 0;



	hub_ip = (vmhub == AMDGPU_GFXHUB(0)) ?

	hub_ip = (AMDGPU_IS_GFXHUB(vmhub)) ?

		   GC_HWIP : MMHUB_HWIP;



	spin_lock(&adev->gmc.invalidate_lock);
@@ -274,7 +274,7 @@ static void gmc_v12_1_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid, 
	}



	/* Issue additional private vm invalidation to MMHUB */

	if ((vmhub != AMDGPU_GFXHUB(0)) &&

	if (!AMDGPU_IS_GFXHUB(vmhub) &&

	    (hub->vm_l2_bank_select_reserved_cid2) &&

		!amdgpu_sriov_vf(adev)) {

		inv_req = RREG32_NO_KIQ(hub->vm_l2_bank_select_reserved_cid2);
@@ -307,7 +307,7 @@ static void gmc_v12_1_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid, 
static void gmc_v12_1_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,

				    uint32_t vmhub, uint32_t flush_type)

{

	if ((vmhub == AMDGPU_GFXHUB(0)) && !adev->gfx.is_poweron)

	if (AMDGPU_IS_GFXHUB(vmhub) && !adev->gfx.is_poweron)

		return;



	/* This is necessary for SRIOV as well as for GFXOFF to function