|
@@ -1177,7 +1177,7 @@ struct radeon_device {
|
|
|
/* Register mmio */
|
|
|
resource_size_t rmmio_base;
|
|
|
resource_size_t rmmio_size;
|
|
|
- void *rmmio;
|
|
|
+ void __iomem *rmmio;
|
|
|
radeon_rreg_t mc_rreg;
|
|
|
radeon_wreg_t mc_wreg;
|
|
|
radeon_rreg_t pll_rreg;
|
|
@@ -1254,20 +1254,20 @@ int radeon_gpu_wait_for_idle(struct radeon_device *rdev);
|
|
|
static inline uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg)
|
|
|
{
|
|
|
if (reg < rdev->rmmio_size)
|
|
|
- return readl(((void __iomem *)rdev->rmmio) + reg);
|
|
|
+ return readl((rdev->rmmio) + reg);
|
|
|
else {
|
|
|
- writel(reg, ((void __iomem *)rdev->rmmio) + RADEON_MM_INDEX);
|
|
|
- return readl(((void __iomem *)rdev->rmmio) + RADEON_MM_DATA);
|
|
|
+ writel(reg, (rdev->rmmio) + RADEON_MM_INDEX);
|
|
|
+ return readl((rdev->rmmio) + RADEON_MM_DATA);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
static inline void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
|
|
|
{
|
|
|
if (reg < rdev->rmmio_size)
|
|
|
- writel(v, ((void __iomem *)rdev->rmmio) + reg);
|
|
|
+ writel(v, (rdev->rmmio) + reg);
|
|
|
else {
|
|
|
- writel(reg, ((void __iomem *)rdev->rmmio) + RADEON_MM_INDEX);
|
|
|
- writel(v, ((void __iomem *)rdev->rmmio) + RADEON_MM_DATA);
|
|
|
+ writel(reg, (rdev->rmmio) + RADEON_MM_INDEX);
|
|
|
+ writel(v, (rdev->rmmio) + RADEON_MM_DATA);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1299,10 +1299,10 @@ static inline void r100_io_wreg(struct radeon_device *rdev, u32 reg, u32 v)
|
|
|
/*
|
|
|
* Registers read & write functions.
|
|
|
*/
|
|
|
-#define RREG8(reg) readb(((void __iomem *)rdev->rmmio) + (reg))
|
|
|
-#define WREG8(reg, v) writeb(v, ((void __iomem *)rdev->rmmio) + (reg))
|
|
|
-#define RREG16(reg) readw(((void __iomem *)rdev->rmmio) + (reg))
|
|
|
-#define WREG16(reg, v) writew(v, ((void __iomem *)rdev->rmmio) + (reg))
|
|
|
+#define RREG8(reg) readb((rdev->rmmio) + (reg))
|
|
|
+#define WREG8(reg, v) writeb(v, (rdev->rmmio) + (reg))
|
|
|
+#define RREG16(reg) readw((rdev->rmmio) + (reg))
|
|
|
+#define WREG16(reg, v) writew(v, (rdev->rmmio) + (reg))
|
|
|
#define RREG32(reg) r100_mm_rreg(rdev, (reg))
|
|
|
#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", r100_mm_rreg(rdev, (reg)))
|
|
|
#define WREG32(reg, v) r100_mm_wreg(rdev, (reg), (v))
|