2 files changed, 6 insertions, 0 deletions

diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 37dd6449f46f..bcd55917c7cc 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -2759,6 +2759,9 @@ int evergreen_irq_process(struct radeon_device *rdev)
                 return IRQ_NONE;
         }
 restart_ih:
+        /* Order reading of wptr vs. reading of IH ring data */
+        rmb();
+
         /* display interrupts */
         evergreen_irq_ack(rdev);
 
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index f56e65579835..aa5571b73aa0 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -3318,6 +3318,9 @@ int r600_irq_process(struct radeon_device *rdev)
         }
 
 restart_ih:
+        /* Order reading of wptr vs. reading of IH ring data */
+        rmb();
+
         /* display interrupts */
         r600_irq_ack(rdev);