|
@@ -4266,7 +4266,7 @@ static void ironlake_enable_drps(struct drm_device *dev)
|
|
|
|
|
|
if (wait_for_atomic((I915_READ(MEMSWCTL) & MEMCTL_CMD_STS) == 0, 10))
|
|
if (wait_for_atomic((I915_READ(MEMSWCTL) & MEMCTL_CMD_STS) == 0, 10))
|
|
DRM_ERROR("stuck trying to change perf mode\n");
|
|
DRM_ERROR("stuck trying to change perf mode\n");
|
|
- msleep(1);
|
|
|
|
|
|
+ mdelay(1);
|
|
|
|
|
|
ironlake_set_drps(dev, fstart);
|
|
ironlake_set_drps(dev, fstart);
|
|
|
|
|
|
@@ -4297,10 +4297,10 @@ static void ironlake_disable_drps(struct drm_device *dev)
|
|
|
|
|
|
/* Go back to the starting frequency */
|
|
/* Go back to the starting frequency */
|
|
ironlake_set_drps(dev, dev_priv->ips.fstart);
|
|
ironlake_set_drps(dev, dev_priv->ips.fstart);
|
|
- msleep(1);
|
|
|
|
|
|
+ mdelay(1);
|
|
rgvswctl |= MEMCTL_CMD_STS;
|
|
rgvswctl |= MEMCTL_CMD_STS;
|
|
I915_WRITE(MEMSWCTL, rgvswctl);
|
|
I915_WRITE(MEMSWCTL, rgvswctl);
|
|
- msleep(1);
|
|
|
|
|
|
+ mdelay(1);
|
|
|
|
|
|
spin_unlock_irq(&mchdev_lock);
|
|
spin_unlock_irq(&mchdev_lock);
|
|
}
|
|
}
|