Merge remote-tracking branch 'pci-current/for-linus'

[karo-tx-linux.git] / drivers / gpu / drm / drm_irq.c

diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index b565372a91f36cd90493720f3a12e484d435548d..0de123afdb346164d278bf801424629e2059b242 100644 (file)
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -128,7 +128,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. */
@@ -868,9 +868,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();
 }
 
 /**
@@ -1479,9 +1479,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);