Update the DRM to latest from DRI CVS. This is approximately the version

included in XFree86 4.3, but includes some fixes.  Notable changes include
Radeon 8500-9100 support, PCI Radeon/Rage 128 support, transform & lighting
support for Radeons, and vblank syncing support for r128, radeon, and mga.
The gamma driver was removed due to lack of any users.

1 files changed, 13 insertions, 91 deletions

diff --git a/sys/dev/drm/r128_drv.c b/sys/dev/drm/r128_drv.c
index 9361d0b..611014e 100644
--- a/sys/dev/drm/r128_drv.c
+++ b/sys/dev/drm/r128_drv.c
@@ -31,53 +31,31 @@
  * $FreeBSD$
  */
 
-#ifdef __linux__
-#include <linux/config.h>
-#endif /* __linux__ */
-
-#ifdef __FreeBSD__
-#include <sys/types.h>
-#include <sys/bus.h>
-#include <pci/pcivar.h>
-#endif /* __FreeBSD__ */
-
 #include "dev/drm/r128.h"
 #include "dev/drm/drmP.h"
+#include "dev/drm/drm.h"
 #include "dev/drm/r128_drm.h"
 #include "dev/drm/r128_drv.h"
 #if __REALLY_HAVE_SG
-#include "ati_pcigart.h"
+#include "dev/drm/ati_pcigart.h"
 #endif
 
-#define DRIVER_AUTHOR		"Gareth Hughes, VA Linux Systems Inc."
-
-#define DRIVER_NAME		"r128"
-#define DRIVER_DESC		"ATI Rage 128"
-#define DRIVER_DATE		"20010405"
-
-#define DRIVER_MAJOR		2
-#define DRIVER_MINOR		2
-#define DRIVER_PATCHLEVEL	0
-
-#ifdef __FreeBSD__
-/* List acquired from xc/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
- * Please report to eanholt@gladstone.uoregon.edu if your chip isn't
- * represented in the list or if the information is incorrect.
+/* List acquired from http://www.yourvote.com/pci/pcihdr.h and xc/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
+ * Please report to eta@lclark.edu inaccuracies or if a chip you have works that is marked unsupported here.
  */
-/* PCI cards are not supported with DRI under FreeBSD. */
 drm_chipinfo_t DRM(devicelist)[] = {
-	{0x1002, 0x4c45, 0, "ATI Rage 128 Mobility LE (PCI)"},
+	{0x1002, 0x4c45, __REALLY_HAVE_SG, "ATI Rage 128 Mobility LE (PCI)"},
 	{0x1002, 0x4c46, 1, "ATI Rage 128 Mobility LF (AGP)"},
 	{0x1002, 0x4d46, 1, "ATI Rage 128 Mobility MF (AGP)"},
 	{0x1002, 0x4d4c, 1, "ATI Rage 128 Mobility ML (AGP)"},
-	{0x1002, 0x5044, 0, "ATI Rage 128 Pro PD (PCI)"},
+	{0x1002, 0x5044, __REALLY_HAVE_SG, "ATI Rage 128 Pro PD (PCI)"},
 	{0x1002, 0x5046, 1, "ATI Rage 128 Pro PF (AGP)"},
-	{0x1002, 0x5050, 0, "ATI Rage 128 Pro PP (PCI)"},
-	{0x1002, 0x5052, 0, "ATI Rage 128 Pro PR (PCI)"},
-	{0x1002, 0x5245, 0, "ATI Rage 128 RE (PCI)"},
+	{0x1002, 0x5050, __REALLY_HAVE_SG, "ATI Rage 128 Pro PP (PCI)"},
+	{0x1002, 0x5052, __REALLY_HAVE_SG, "ATI Rage 128 Pro PR (PCI)"},
+	{0x1002, 0x5245, __REALLY_HAVE_SG, "ATI Rage 128 RE (PCI)"},
 	{0x1002, 0x5246, 1, "ATI Rage 128 RF (AGP)"},
 	{0x1002, 0x5247, 1, "ATI Rage 128 RG (AGP)"},
-	{0x1002, 0x524b, 0, "ATI Rage 128 RK (PCI)"},
+	{0x1002, 0x524b, __REALLY_HAVE_SG, "ATI Rage 128 RK (PCI)"},
 	{0x1002, 0x524c, 1, "ATI Rage 128 RL (AGP)"},
 	{0x1002, 0x534d, 1, "ATI Rage 128 SM (AGP)"},
 	{0x1002, 0x5446, 1, "ATI Rage 128 Pro Ultra TF (AGP)"},
@@ -85,36 +63,6 @@ drm_chipinfo_t DRM(devicelist)[] = {
 	{0x1002, 0x5452, 1, "ATI Rage 128 Pro Ultra TR (AGP)"},
 	{0, 0, 0, NULL}
 };
-#endif /* __FreeBSD__ */
-
-#define DRIVER_IOCTLS							    \
-   [DRM_IOCTL_NR(DRM_IOCTL_DMA)]             = { r128_cce_buffers,  1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_INIT)]       = { r128_cce_init,     1, 1 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_START)]  = { r128_cce_start,    1, 1 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_STOP)]   = { r128_cce_stop,     1, 1 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_RESET)]  = { r128_cce_reset,    1, 1 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_CCE_IDLE)]   = { r128_cce_idle,     1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_RESET)]      = { r128_engine_reset, 1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_FULLSCREEN)] = { r128_fullscreen,   1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_SWAP)]       = { r128_cce_swap,     1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_CLEAR)]      = { r128_cce_clear,    1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_VERTEX)]     = { r128_cce_vertex,   1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_INDICES)]    = { r128_cce_indices,  1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_BLIT)]       = { r128_cce_blit,     1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_DEPTH)]      = { r128_cce_depth,    1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_STIPPLE)]    = { r128_cce_stipple,  1, 0 }, \
-   [DRM_IOCTL_NR(DRM_IOCTL_R128_INDIRECT)]   = { r128_cce_indirect, 1, 1 },
-
-
-#if 0
-/* GH: Count data sent to card via ring or vertex/indirect buffers.
- */
-#define __HAVE_COUNTERS         3
-#define __HAVE_COUNTER6         _DRM_STAT_IRQ
-#define __HAVE_COUNTER7         _DRM_STAT_PRIMARY
-#define __HAVE_COUNTER8         _DRM_STAT_SECONDARY
-#endif
-
 
 #include "dev/drm/drm_agpsupport.h"
 #include "dev/drm/drm_auth.h"
@@ -123,45 +71,19 @@ drm_chipinfo_t DRM(devicelist)[] = {
 #include "dev/drm/drm_dma.h"
 #include "dev/drm/drm_drawable.h"
 #include "dev/drm/drm_drv.h"
-
-#ifdef __linux__
-#ifndef MODULE
-/* DRM(options) is called by the kernel to parse command-line options
- * passed via the boot-loader (e.g., LILO).  It calls the insmod option
- * routine, drm_parse_drm.
- */
-
-/* JH- We have to hand expand the string ourselves because of the cpp.  If
- * anyone can think of a way that we can fit into the __setup macro without
- * changing it, then please send the solution my way.
- */
-static int __init r128_options( char *str )
-{
-	DRM(parse_options)( str );
-	return 1;
-}
-
-__setup( DRIVER_NAME "=", r128_options );
-#endif
-#endif /* __linux__ */
-
 #include "dev/drm/drm_fops.h"
 #include "dev/drm/drm_init.h"
 #include "dev/drm/drm_ioctl.h"
 #include "dev/drm/drm_lock.h"
 #include "dev/drm/drm_memory.h"
-#ifdef __linux__
-#include "dev/drm/drm_proc.h"
-#include "dev/drm/drm_stub.h"
-#endif /* __linux__ */
-#ifdef __FreeBSD__
 #include "dev/drm/drm_sysctl.h"
-#endif /* __FreeBSD__ */
 #include "dev/drm/drm_vm.h"
-#if __REALLY_HAVE_SG
+#if __HAVE_SG
 #include "dev/drm/drm_scatter.h"
 #endif
 
 #ifdef __FreeBSD__
 DRIVER_MODULE(r128, pci, r128_driver, r128_devclass, 0, 0);
+#elif defined(__NetBSD__)
+CFDRIVER_DECL(r128, DV_TTY, NULL);
 #endif /* __FreeBSD__ */