mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
drm/radeon/kms: fix MSI re-arm on rv370+
MSI_REARM_EN register is a write only trigger register. There is no need RMW when re-arming. May fix: https://bugs.freedesktop.org/show_bug.cgi?id=41668 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> CC: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
6f9f8a6108
commit
b7f5b7dec3
2 changed files with 2 additions and 6 deletions
|
@ -789,9 +789,7 @@ int r100_irq_process(struct radeon_device *rdev)
|
||||||
WREG32(RADEON_AIC_CNTL, msi_rearm | RS400_MSI_REARM);
|
WREG32(RADEON_AIC_CNTL, msi_rearm | RS400_MSI_REARM);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
msi_rearm = RREG32(RADEON_MSI_REARM_EN) & ~RV370_MSI_REARM_EN;
|
WREG32(RADEON_MSI_REARM_EN, RV370_MSI_REARM_EN);
|
||||||
WREG32(RADEON_MSI_REARM_EN, msi_rearm);
|
|
||||||
WREG32(RADEON_MSI_REARM_EN, msi_rearm | RV370_MSI_REARM_EN);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -684,9 +684,7 @@ int rs600_irq_process(struct radeon_device *rdev)
|
||||||
WREG32(RADEON_BUS_CNTL, msi_rearm | RS600_MSI_REARM);
|
WREG32(RADEON_BUS_CNTL, msi_rearm | RS600_MSI_REARM);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
msi_rearm = RREG32(RADEON_MSI_REARM_EN) & ~RV370_MSI_REARM_EN;
|
WREG32(RADEON_MSI_REARM_EN, RV370_MSI_REARM_EN);
|
||||||
WREG32(RADEON_MSI_REARM_EN, msi_rearm);
|
|
||||||
WREG32(RADEON_MSI_REARM_EN, msi_rearm | RV370_MSI_REARM_EN);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue