1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index c2676b5908d9..ec5c3f4cdd01 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -156,7 +156,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc)
          */
         if ((vblrc > 0) && (abs64(diff_ns) > 1000000)) {
                 atomic_inc(&dev->vblank[crtc].count);
-                smp_mb__after_atomic_inc();
+                smp_mb__after_atomic();
         }
 
         /* Invalidate all timestamps while vblank irq's are off. */
@@ -864,9 +864,9 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc)
                 vblanktimestamp(dev, crtc, tslot) = t_vblank;
         }
 
-        smp_mb__before_atomic_inc();
+        smp_mb__before_atomic();
         atomic_add(diff, &dev->vblank[crtc].count);
-        smp_mb__after_atomic_inc();
+        smp_mb__after_atomic();
 }
 
 /**
@@ -1330,9 +1330,9 @@ bool drm_handle_vblank(struct drm_device *dev, int crtc)
                 /* Increment cooked vblank count. This also atomically commits
                  * the timestamp computed above.
                  */
-                smp_mb__before_atomic_inc();
+                smp_mb__before_atomic();
                 atomic_inc(&dev->vblank[crtc].count);
-                smp_mb__after_atomic_inc();
+                smp_mb__after_atomic();
         } else {
                 DRM_DEBUG("crtc %d: Redundant vblirq ignored. diff_ns = %d\n",
                           crtc, (int) diff_ns);