Merge from DRI CVS. Includes newly ported SiS 300/305/540/630/730 driver and

updates to allow system memory to be used for textures on PCI Radeons.

Sponsored by:	LinuxFund

1 files changed, 5 insertions, 0 deletions

diff --git a/sys/dev/drm/drm_memory.h b/sys/dev/drm/drm_memory.h
index f4e1133..a0e88ee 100644
--- a/sys/dev/drm/drm_memory.h
+++ b/sys/dev/drm/drm_memory.h
@@ -59,6 +59,11 @@ void *DRM(alloc)(size_t size, int area)
 	return malloc(size, DRM(M_DRM), M_NOWAIT);
 }
 
+void *DRM(calloc)(size_t nmemb, size_t size, int area)
+{
+	return malloc(size * nmemb, DRM(M_DRM), M_NOWAIT | M_ZERO);
+}
+
 void *DRM(realloc)(void *oldpt, size_t oldsize, size_t size, int area)
 {
 	void *pt;