Commit 07944623 authored by Emily Deng's avatar Emily Deng Committed by Alex Deucher
Browse files

drm/amdgpu: access register without KIQ 



There is no need to access register such as mmSMC_IND_INDEX_11
and mmSMC_IND_DATA_11, PCIE_INDEX, PCIE_DATA through KIQ because
they are VF-copy.

Signed-off-by: default avatarEmily Deng <Emily.Deng@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7b184b00

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

+9 −9
Original line number Diff line number Diff line
@@ -87,9 +87,9 @@ static u32 vi_pcie_rreg(struct amdgpu_device *adev, u32 reg) 
	u32 r;



	spin_lock_irqsave(&adev->pcie_idx_lock, flags);

	WREG32(mmPCIE_INDEX, reg);

	(void)RREG32(mmPCIE_INDEX);

	r = RREG32(mmPCIE_DATA);

	WREG32_NO_KIQ(mmPCIE_INDEX, reg);

	(void)RREG32_NO_KIQ(mmPCIE_INDEX);

	r = RREG32_NO_KIQ(mmPCIE_DATA);

	spin_unlock_irqrestore(&adev->pcie_idx_lock, flags);

	return r;

}
@@ -99,10 +99,10 @@ static void vi_pcie_wreg(struct amdgpu_device *adev, u32 reg, u32 v) 
	unsigned long flags;



	spin_lock_irqsave(&adev->pcie_idx_lock, flags);

	WREG32(mmPCIE_INDEX, reg);

	(void)RREG32(mmPCIE_INDEX);

	WREG32(mmPCIE_DATA, v);

	(void)RREG32(mmPCIE_DATA);

	WREG32_NO_KIQ(mmPCIE_INDEX, reg);

	(void)RREG32_NO_KIQ(mmPCIE_INDEX);

	WREG32_NO_KIQ(mmPCIE_DATA, v);

	(void)RREG32_NO_KIQ(mmPCIE_DATA);

	spin_unlock_irqrestore(&adev->pcie_idx_lock, flags);

}
@@ -123,8 +123,8 @@ static void vi_smc_wreg(struct amdgpu_device *adev, u32 reg, u32 v) 
	unsigned long flags;



	spin_lock_irqsave(&adev->smc_idx_lock, flags);

	WREG32(mmSMC_IND_INDEX_11, (reg));

	WREG32(mmSMC_IND_DATA_11, (v));

	WREG32_NO_KIQ(mmSMC_IND_INDEX_11, (reg));

	WREG32_NO_KIQ(mmSMC_IND_DATA_11, (v));

	spin_unlock_irqrestore(&adev->smc_idx_lock, flags);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE