drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)

[deliverable/linux.git] / drivers / gpu / drm / radeon / atom.c

diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
index 14cc88aaf3a757163e8a5c7f371943f945e20912..d1bd239cd9e9eef5f88ef06e4964f158a7490986 100644 (file)
--- a/drivers/gpu/drm/radeon/atom.c
+++ b/drivers/gpu/drm/radeon/atom.c
@@ -665,6 +665,8 @@ static void atom_op_delay(atom_exec_context *ctx, int *ptr, int arg)
        SDEBUG("   count: %d\n", count);
        if (arg == ATOM_UNIT_MICROSEC)
                udelay(count);
+       else if (!drm_can_sleep())
+               mdelay(count);
        else
                msleep(count);
 }