diff options
| author | Huang Rui <ray.huang@amd.com> | 2019-02-25 15:02:44 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-02-27 22:18:59 -0500 |
| commit | 76f8f6992a0cf7e4a8401eadaa67ea4a06e54568 (patch) | |
| tree | bab247bcdd198f82c63b05a6ef942f15c3851eb9 /drivers/gpu/drm/amd | |
| parent | 5307db85c745c46295f3ee2159667e1606fba268 (diff) | |
| download | linux-stable-76f8f6992a0cf7e4a8401eadaa67ea4a06e54568.tar.gz linux-stable-76f8f6992a0cf7e4a8401eadaa67ea4a06e54568.tar.bz2 linux-stable-76f8f6992a0cf7e4a8401eadaa67ea4a06e54568.zip | |
drm/amdgpu: use REG32_PCIE wrapper instead for psp
This patch uses REG32_PCIE wrapper instead of writting pci_index2 and reading
pci_data2 for psp. This sequence should be protected by pcie_idx_lock.
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c index c63de945c021..0487e3a4e9e7 100644 --- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c @@ -500,9 +500,7 @@ static bool psp_v3_1_smu_reload_quirk(struct psp_context *psp) struct amdgpu_device *adev = psp->adev; uint32_t reg; - reg = smnMP1_FIRMWARE_FLAGS | 0x03b00000; - WREG32_SOC15(NBIO, 0, mmPCIE_INDEX2, reg); - reg = RREG32_SOC15(NBIO, 0, mmPCIE_DATA2); + reg = RREG32_PCIE(smnMP1_FIRMWARE_FLAGS | 0x03b00000); return (reg & MP1_FIRMWARE_FLAGS__INTERRUPTS_ENABLED_MASK) ? true : false; } |