diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2012-10-25 16:06:59 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-04-09 10:31:40 -0400 |
| commit | 492d2b61b3c73345015b5601f493e9e92ea1a56e (patch) | |
| tree | 0ccd48f6afaefe28ea0c028b0d298dd155837e46 /drivers/gpu/drm/radeon/radeon.h | |
| parent | 0363a559728e539051e29765f08f312c7b1dfde3 (diff) | |
drm/radeon/kms: replace *REG32_PCIE_P with *REG32_PCIE_PORT
Avoid confusion with the *REG32_P mask macro.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index fb1780a28139..394b20fa27dc 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
| @@ -1731,8 +1731,8 @@ void r100_io_wreg(struct radeon_device *rdev, u32 reg, u32 v); | |||
| 1731 | #define WREG32_MC(reg, v) rdev->mc_wreg(rdev, (reg), (v)) | 1731 | #define WREG32_MC(reg, v) rdev->mc_wreg(rdev, (reg), (v)) |
| 1732 | #define RREG32_PCIE(reg) rv370_pcie_rreg(rdev, (reg)) | 1732 | #define RREG32_PCIE(reg) rv370_pcie_rreg(rdev, (reg)) |
| 1733 | #define WREG32_PCIE(reg, v) rv370_pcie_wreg(rdev, (reg), (v)) | 1733 | #define WREG32_PCIE(reg, v) rv370_pcie_wreg(rdev, (reg), (v)) |
| 1734 | #define RREG32_PCIE_P(reg) rdev->pciep_rreg(rdev, (reg)) | 1734 | #define RREG32_PCIE_PORT(reg) rdev->pciep_rreg(rdev, (reg)) |
| 1735 | #define WREG32_PCIE_P(reg, v) rdev->pciep_wreg(rdev, (reg), (v)) | 1735 | #define WREG32_PCIE_PORT(reg, v) rdev->pciep_wreg(rdev, (reg), (v)) |
| 1736 | #define WREG32_P(reg, val, mask) \ | 1736 | #define WREG32_P(reg, val, mask) \ |
| 1737 | do { \ | 1737 | do { \ |
| 1738 | uint32_t tmp_ = RREG32(reg); \ | 1738 | uint32_t tmp_ = RREG32(reg); \ |