|
@@ -1228,45 +1228,10 @@ int radeon_device_init(struct radeon_device *rdev,
|
|
|
void radeon_device_fini(struct radeon_device *rdev);
|
|
|
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((rdev->rmmio) + reg);
|
|
|
- else {
|
|
|
- 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, (rdev->rmmio) + reg);
|
|
|
- else {
|
|
|
- writel(reg, (rdev->rmmio) + RADEON_MM_INDEX);
|
|
|
- writel(v, (rdev->rmmio) + RADEON_MM_DATA);
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-static inline u32 r100_io_rreg(struct radeon_device *rdev, u32 reg)
|
|
|
-{
|
|
|
- if (reg < rdev->rio_mem_size)
|
|
|
- return ioread32(rdev->rio_mem + reg);
|
|
|
- else {
|
|
|
- iowrite32(reg, rdev->rio_mem + RADEON_MM_INDEX);
|
|
|
- return ioread32(rdev->rio_mem + RADEON_MM_DATA);
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-static inline void r100_io_wreg(struct radeon_device *rdev, u32 reg, u32 v)
|
|
|
-{
|
|
|
- if (reg < rdev->rio_mem_size)
|
|
|
- iowrite32(v, rdev->rio_mem + reg);
|
|
|
- else {
|
|
|
- iowrite32(reg, rdev->rio_mem + RADEON_MM_INDEX);
|
|
|
- iowrite32(v, rdev->rio_mem + RADEON_MM_DATA);
|
|
|
- }
|
|
|
-}
|
|
|
+uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg);
|
|
|
+void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v);
|
|
|
+u32 r100_io_rreg(struct radeon_device *rdev, u32 reg);
|
|
|
+void r100_io_wreg(struct radeon_device *rdev, u32 reg, u32 v);
|
|
|
|
|
|
/*
|
|
|
* Cast helper
|