mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-10 11:40:19 -04:00
drm/amdgpu/gfx10: remove redundant repeated nested 0 check
The repeated checks on grbm_soft_reset are unnecessary. Remove them. Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
committed by
Alex Deucher
parent
9ed3d7bdf2
commit
8802ec0eba
@@ -7668,19 +7668,17 @@ static int gfx_v10_0_soft_reset(struct amdgpu_ip_block *ip_block)
|
||||
/* Disable MEC parsing/prefetching */
|
||||
gfx_v10_0_cp_compute_enable(adev, false);
|
||||
|
||||
if (grbm_soft_reset) {
|
||||
tmp = RREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET);
|
||||
tmp |= grbm_soft_reset;
|
||||
dev_info(adev->dev, "GRBM_SOFT_RESET=0x%08X\n", tmp);
|
||||
WREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET, tmp);
|
||||
tmp = RREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET);
|
||||
tmp = RREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET);
|
||||
tmp |= grbm_soft_reset;
|
||||
dev_info(adev->dev, "GRBM_SOFT_RESET=0x%08X\n", tmp);
|
||||
WREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET, tmp);
|
||||
tmp = RREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET);
|
||||
|
||||
udelay(50);
|
||||
udelay(50);
|
||||
|
||||
tmp &= ~grbm_soft_reset;
|
||||
WREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET, tmp);
|
||||
tmp = RREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET);
|
||||
}
|
||||
tmp &= ~grbm_soft_reset;
|
||||
WREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET, tmp);
|
||||
tmp = RREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET);
|
||||
|
||||
/* Wait a little for things to settle down */
|
||||
udelay(50);
|
||||
|
||||
Reference in New Issue
Block a user