From: Michel D?nzer <michel.daen...@amd.com> It can be the case e.g. when switching to console for panic output.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43941 Signed-off-by: Michel D?nzer <michel.daenzer at amd.com> --- v2: Still call msleep() in the normal case. Only compile tested. drivers/gpu/drm/radeon/atom.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c index 14cc88a..4092e59 100644 --- 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 (in_interrupt() || irqs_disabled() || in_atomic()) + mdelay(count); else msleep(count); } -- 1.7.7.3
