1 files changed, 18 insertions, 5 deletions

diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index 376884f1bcd2..8ff7cac222dc 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -4135,23 +4135,36 @@ int r100_init(struct radeon_device *rdev)
         return 0;
 }
 
-uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg)
+uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg,
+                      bool always_indirect)
 {
-        if (reg < rdev->rmmio_size)
+        if (reg < rdev->rmmio_size && !always_indirect)
                 return readl(((void __iomem *)rdev->rmmio) + reg);
         else {
+                unsigned long flags;
+                uint32_t ret;
+
+                spin_lock_irqsave(&rdev->mmio_idx_lock, flags);
                 writel(reg, ((void __iomem *)rdev->rmmio) + RADEON_MM_INDEX);
-                return readl(((void __iomem *)rdev->rmmio) + RADEON_MM_DATA);
+                ret = readl(((void __iomem *)rdev->rmmio) + RADEON_MM_DATA);
+                spin_unlock_irqrestore(&rdev->mmio_idx_lock, flags);
+
+                return ret;
         }
 }
 
-void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v)
+void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v,
+                  bool always_indirect)
 {
-        if (reg < rdev->rmmio_size)
+        if (reg < rdev->rmmio_size && !always_indirect)
                 writel(v, ((void __iomem *)rdev->rmmio) + reg);
         else {
+                unsigned long flags;
+
+                spin_lock_irqsave(&rdev->mmio_idx_lock, flags);
                 writel(reg, ((void __iomem *)rdev->rmmio) + RADEON_MM_INDEX);
                 writel(v, ((void __iomem *)rdev->rmmio) + RADEON_MM_DATA);
+                spin_unlock_irqrestore(&rdev->mmio_idx_lock, flags);
         }
 }