diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-18 08:10:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-18 08:10:21 -0800 |
| commit | 86404ab60df2ea65f39be936fc11762b642810c3 (patch) | |
| tree | 9834aa4ba93dbdb398d007eaba639f27148d4bdf /drivers/gpu/drm/radeon/atom.c | |
| parent | ab320af2244462703455dac59fe5ceede24d3662 (diff) | |
| parent | 6b15835282f9c6a023e2625455bfdb822bb9cc64 (diff) | |
| download | linux-86404ab60df2ea65f39be936fc11762b642810c3.tar.gz linux-86404ab60df2ea65f39be936fc11762b642810c3.tar.bz2 linux-86404ab60df2ea65f39be936fc11762b642810c3.zip | |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: fix bo's fence association
drm/radeon/kms: fix indirect buffer management V2
drm/edid: Fix interlaced detailed timings to be frame size, not field.
drm/vmwgfx: Use fb handover mechanism instead of stealth mode.
drm/radeon/kms: use udelay for short delays
drm/nouveau: Force TV encoder DPMS reinit after resume.
drm/nouveau: use mutex for vbios lock
Diffstat (limited to 'drivers/gpu/drm/radeon/atom.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/atom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c index 2a3df5599ab4..7f152f66f196 100644 --- a/drivers/gpu/drm/radeon/atom.c +++ b/drivers/gpu/drm/radeon/atom.c @@ -643,7 +643,7 @@ 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); else schedule_timeout_uninterruptible(msecs_to_jiffies(count)); } |