Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6adfb1ef authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: s/mdelay/msleep/ 



Burning cpu cycles isn't awesome, so use sleeps instead.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3fec3d2f

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1026,7 +1026,7 @@ static bool pipe_dsl_stopped(struct drm_device *dev, enum pipe pipe) 
		line_mask = DSL_LINEMASK_GEN3;

		line_mask = DSL_LINEMASK_GEN3;





	line1 = I915_READ(reg) & line_mask;

	line1 = I915_READ(reg) & line_mask;

	mdelay(5);

	msleep(5);

	line2 = I915_READ(reg) & line_mask;

	line2 = I915_READ(reg) & line_mask;





	return line1 == line2;

	return line1 == line2;

drivers/gpu/drm/i915/intel_pm.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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))

	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");

	mdelay(1);

	msleep(1);





	ironlake_set_drps(dev, fstart);

	ironlake_set_drps(dev, fstart);
@@ -4286,10 +4286,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);

	mdelay(1);

	msleep(1);

	rgvswctl |= MEMCTL_CMD_STS;

	rgvswctl |= MEMCTL_CMD_STS;

	I915_WRITE(MEMSWCTL, rgvswctl);

	I915_WRITE(MEMSWCTL, rgvswctl);

	mdelay(1);

	msleep(1);





	spin_unlock_irq(&mchdev_lock);

	spin_unlock_irq(&mchdev_lock);

}

}