summaryrefslogtreecommitdiffstats
path: root/sys/dev/drm/ati_pcigart.h
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2003-10-24 01:48:17 +0000
committeranholt <anholt@FreeBSD.org>2003-10-24 01:48:17 +0000
commitfffd429f130bdf80ca2848cffd6181a42663611c (patch)
tree0b507800113111f07b903adcbb43253df735be46 /sys/dev/drm/ati_pcigart.h
parent841ffbf14af9b09c4c8844dc47d53fd486d236f9 (diff)
downloadFreeBSD-src-fffd429f130bdf80ca2848cffd6181a42663611c.zip
FreeBSD-src-fffd429f130bdf80ca2848cffd6181a42663611c.tar.gz
Update to latest from DRI CVS. Primary new feature is mostly-complete smpng
locking, and the apparently unnecessary locking for -stable has been removed. This may fix issues with missed interrupts since April, which manifested themselves as slowdowns or hangs in radeon, in particular. Many cleanups also took place. In the shared code, there are improvements to r128 driver stability.
Diffstat (limited to 'sys/dev/drm/ati_pcigart.h')
-rw-r--r--sys/dev/drm/ati_pcigart.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/drm/ati_pcigart.h b/sys/dev/drm/ati_pcigart.h
index c37c95f..dd1141f 100644
--- a/sys/dev/drm/ati_pcigart.h
+++ b/sys/dev/drm/ati_pcigart.h
@@ -60,7 +60,7 @@ int DRM(ati_pcigart_init)( drm_device_t *dev,
}
address = (long)contigmalloc((1 << ATI_PCIGART_TABLE_ORDER) * PAGE_SIZE,
- DRM(M_DRM), M_WAITOK, 0ul, 0xfffffffful, PAGE_SIZE, 0);
+ DRM(M_DRM), M_NOWAIT, 0ul, 0xfffffffful, PAGE_SIZE, 0);
if ( !address ) {
DRM_ERROR( "cannot allocate PCI GART page!\n" );
goto done;
OpenPOWER on IntegriCloud