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, 60 insertions, 0 deletions

diff --git a/sys/dev/drm/sis_drv.c b/sys/dev/drm/sis_drv.c
new file mode 100644
index 0000000..fdf0f16
--- /dev/null
+++ b/sys/dev/drm/sis_drv.c
@@ -0,0 +1,60 @@
+/* sis.c -- sis driver -*- linux-c -*-
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * $FreeBSD$
+ */
+
+#include "dev/drm/sis.h"
+#include "dev/drm/drmP.h"
+#include "dev/drm/sis_drm.h"
+#include "dev/drm/sis_drv.h"
+
+drm_chipinfo_t DRM(devicelist)[] = {
+	{0x1039, 0x0300, 1, "SiS 300"},
+	{0x1039, 0x5300, 1, "SiS 540"},
+	{0x1039, 0x6300, 1, "SiS 630"},
+	{0, 0, 0, NULL}
+};
+
+#include "dev/drm/drm_auth.h"
+#include "dev/drm/drm_agpsupport.h"
+#include "dev/drm/drm_bufs.h"
+#include "dev/drm/drm_context.h"
+#include "dev/drm/drm_dma.h"
+#include "dev/drm/drm_drawable.h"
+#include "dev/drm/drm_drv.h"
+#include "dev/drm/drm_fops.h"
+#include "dev/drm/drm_ioctl.h"
+#include "dev/drm/drm_lock.h"
+#include "dev/drm/drm_memory.h"
+#include "dev/drm/drm_vm.h"
+#include "dev/drm/drm_sysctl.h"
+
+#ifdef __FreeBSD__
+/* Avoid clash with sis ethernet */
+DRIVER_MODULE(sisdrm, pci, sis_driver, sis_devclass, 0, 0);
+#elif defined(__NetBSD__)
+CFDRIVER_DECL(sis, DV_TTY, NULL);
+#endif /* __FreeBSD__ */