drm/i915: s/mdelay/msleep/
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 7 Jul 2015 07:10:40 +0000 (09:10 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 7 Jul 2015 09:41:40 +0000 (11:41 +0200)
Burning cpu cycles isn't awesome, so use sleeps instead.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_pm.c

index 99bf147b2f686fc777904af405e455d5168b6e88..737e939cf0f4ea921c1894243ed280651e49df87 100644 (file)
@@ -1026,7 +1026,7 @@ static bool pipe_dsl_stopped(struct drm_device *dev, enum pipe pipe)
                line_mask = DSL_LINEMASK_GEN3;
 
        line1 = I915_READ(reg) & line_mask;
-       mdelay(5);
+       msleep(5);
        line2 = I915_READ(reg) & line_mask;
 
        return line1 == line2;
index 6eb5d76e691203333407b9f0846914566a04ccf3..1efac89cb7383857d5bb0c9bafb5b1a63af4fe94 100644 (file)
@@ -4255,7 +4255,7 @@ static void ironlake_enable_drps(struct drm_device *dev)
 
        if (wait_for_atomic((I915_READ(MEMSWCTL) & MEMCTL_CMD_STS) == 0, 10))
                DRM_ERROR("stuck trying to change perf mode\n");
-       mdelay(1);
+       msleep(1);
 
        ironlake_set_drps(dev, fstart);
 
@@ -4286,10 +4286,10 @@ static void ironlake_disable_drps(struct drm_device *dev)
 
        /* Go back to the starting frequency */
        ironlake_set_drps(dev, dev_priv->ips.fstart);
-       mdelay(1);
+       msleep(1);
        rgvswctl |= MEMCTL_CMD_STS;
        I915_WRITE(MEMSWCTL, rgvswctl);
-       mdelay(1);
+       msleep(1);
 
        spin_unlock_irq(&mchdev_lock);
 }