From 8a303f59ea035ea9279f5ad1fc39185985f9b56c Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sun, 31 Jan 2010 07:07:14 +1000 Subject: [PATCH] --- yaml --- r: 185565 b: refs/heads/master c: 20d6c346f69ec68f3f4956c726d830c978f911a8 h: refs/heads/master i: 185563: 2c966c5cfd577a5222f1b8ec64786caadd97dbc5 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/atom.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6c89f5441d25..5c26e159161a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57fcab620d05c3eb32b4787ce7501565c4c3162d +refs/heads/master: 20d6c346f69ec68f3f4956c726d830c978f911a8 diff --git a/trunk/drivers/gpu/drm/radeon/atom.c b/trunk/drivers/gpu/drm/radeon/atom.c index e3b44562d265..bd0c843872b2 100644 --- a/trunk/drivers/gpu/drm/radeon/atom.c +++ b/trunk/drivers/gpu/drm/radeon/atom.c @@ -640,7 +640,8 @@ static void atom_op_delay(atom_exec_context *ctx, int *ptr, int arg) uint8_t count = U8((*ptr)++); SDEBUG(" count: %d\n", count); if (arg == ATOM_UNIT_MICROSEC) - schedule_timeout_uninterruptible(usecs_to_jiffies(count)); + udelay(count); + // schedule_timeout_uninterruptible(usecs_to_jiffies(count)); else schedule_timeout_uninterruptible(msecs_to_jiffies(count)); }