Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5307db85 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amd/powerplay: use REG32_PCIE wrapper instead for powerplay 



This patch uses REG32_PCIE wrapper instead of writting pci_index2 and reading
pci_data2 for powerplay. This sequence should be protected by pcie_idx_lock.

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 293b9160

drivers/gpu/drm/amd/powerplay/smumgr/smu9_smumgr.c

+2 −4
Original line number Diff line number Diff line
@@ -40,10 +40,8 @@ bool smu9_is_smc_ram_running(struct pp_hwmgr *hwmgr) 
	struct amdgpu_device *adev = hwmgr->adev;

	uint32_t mp1_fw_flags;



	WREG32_SOC15(NBIF, 0, mmPCIE_INDEX2,

			(MP1_Public | (smnMP1_FIRMWARE_FLAGS & 0xffffffff)));



	mp1_fw_flags = RREG32_SOC15(NBIF, 0, mmPCIE_DATA2);

	mp1_fw_flags = RREG32_PCIE(MP1_Public |

				   (smnMP1_FIRMWARE_FLAGS & 0xffffffff));



	if (mp1_fw_flags & MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED_MASK)

		return true;

drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c

+2 −4
Original line number Diff line number Diff line
@@ -49,10 +49,8 @@ static bool vega20_is_smc_ram_running(struct pp_hwmgr *hwmgr) 
	struct amdgpu_device *adev = hwmgr->adev;

	uint32_t mp1_fw_flags;



	WREG32_SOC15(NBIF, 0, mmPCIE_INDEX2,

		     (MP1_Public | (smnMP1_FIRMWARE_FLAGS & 0xffffffff)));



	mp1_fw_flags = RREG32_SOC15(NBIF, 0, mmPCIE_DATA2);

	mp1_fw_flags = RREG32_PCIE(MP1_Public |

				   (smnMP1_FIRMWARE_FLAGS & 0xffffffff));



	if ((mp1_fw_flags & MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED_MASK) >>

	    MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED__SHIFT)