On Mit, 2012-01-04 at 11:54 +0100, Daniel Vetter wrote:
On Wed, Jan 04, 2012 at 11:33:40AM +0100, Michel Dänzer wrote:
From: Michel Dänzer michel.daenzer@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@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);Afaics in_atomic subsumes in_interrupt. irqs_disabled looks like a nice addition to cover up the !CONFIG_PREEMPT case. i915 (in intel_drv.h) also checks for in_dbg_master() to take care of kdbg.
Can I bother you to create a small helper like in_atomic_kms_context that checks these three things (and also use it in drm/i915)?
Sorry, I've already spent way more time on this than I meant to, and Alan just killed what little motivation I still had to spend more.