Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: move si_ih.c away from sid.h defines 

They are properly defined under oss_1_0_d.h

Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alexandre Demers 2025-03-21 21:46:47 -04:00 committed by Alex Deucher
parent cbd8207e23
commit c82d915fe1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/amd/amdgpu/si_ih.c
View File

@ -214,7 +214,7 @@ static int si_ih_resume(struct amdgpu_ip_block *ip_block)
static bool si_ih_is_idle(struct amdgpu_ip_block *ip_block) static bool si_ih_is_idle(struct amdgpu_ip_block *ip_block)
{ {
struct amdgpu_device *adev = ip_block->adev; struct amdgpu_device *adev = ip_block->adev;
u32 tmp = RREG32(SRBM_STATUS); u32 tmp = RREG32(mmSRBM_STATUS);
if (tmp & SRBM_STATUS__IH_BUSY_MASK) if (tmp & SRBM_STATUS__IH_BUSY_MASK)
return false; return false;
@ -240,23 +240,23 @@ static int si_ih_soft_reset(struct amdgpu_ip_block *ip_block)
struct amdgpu_device *adev = ip_block->adev; struct amdgpu_device *adev = ip_block->adev;
u32 srbm_soft_reset = 0; u32 srbm_soft_reset = 0;
u32 tmp = RREG32(SRBM_STATUS); u32 tmp = RREG32(mmSRBM_STATUS);
if (tmp & SRBM_STATUS__IH_BUSY_MASK) if (tmp & SRBM_STATUS__IH_BUSY_MASK)
srbm_soft_reset |= SRBM_SOFT_RESET__SOFT_RESET_IH_MASK; srbm_soft_reset |= SRBM_SOFT_RESET__SOFT_RESET_IH_MASK;
if (srbm_soft_reset) { if (srbm_soft_reset) {
tmp = RREG32(SRBM_SOFT_RESET); tmp = RREG32(mmSRBM_SOFT_RESET);
tmp |= srbm_soft_reset; tmp |= srbm_soft_reset;
dev_info(adev->dev, "SRBM_SOFT_RESET=0x%08X\n", tmp); dev_info(adev->dev, "mmSRBM_SOFT_RESET=0x%08X\n", tmp);
WREG32(SRBM_SOFT_RESET, tmp); WREG32(mmSRBM_SOFT_RESET, tmp);
tmp = RREG32(SRBM_SOFT_RESET); tmp = RREG32(mmSRBM_SOFT_RESET);
udelay(50); udelay(50);
tmp &= ~srbm_soft_reset; tmp &= ~srbm_soft_reset;
WREG32(SRBM_SOFT_RESET, tmp); WREG32(mmSRBM_SOFT_RESET, tmp);
tmp = RREG32(SRBM_SOFT_RESET); tmp = RREG32(mmSRBM_SOFT_RESET);
udelay(50); udelay(50);
} }