summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas@tungstengraphics.com>2006-07-05 15:52:35 +0000
committerThomas Hellstrom <thomas@tungstengraphics.com>2006-07-05 15:52:35 +0000
commitc21a7b763ad31c3473ba2c9a1a01bb729bc13bb5 (patch)
tree5689099253e1c536c8af8f1b7bd2b29da0f0fcde /shared-core
parent264f60ded4921e00f83198fa48e82037f26e818c (diff)
SiS 315 Awareness.
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/drm_pciids.txt1
-rw-r--r--shared-core/sis_drv.h16
2 files changed, 14 insertions, 3 deletions
diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt
index a86e4a24..e4415c16 100644
--- a/shared-core/drm_pciids.txt
+++ b/shared-core/drm_pciids.txt
@@ -201,6 +201,7 @@
0x1039 0x0300 0 "SiS 300/305"
0x1039 0x5300 0 "SiS 540"
0x1039 0x6300 0 "SiS 630"
+0x1039 0x6330 SIS_CHIP_315 "SiS 661"
0x1039 0x7300 0 "SiS 730"
[tdfx]
diff --git a/shared-core/sis_drv.h b/shared-core/sis_drv.h
index 636e5327..ab3e9ae4 100644
--- a/shared-core/sis_drv.h
+++ b/shared-core/sis_drv.h
@@ -31,21 +31,30 @@
/* General customization:
*/
-#define DRIVER_AUTHOR "SIS"
+#define DRIVER_AUTHOR "SIS, Tungsten Graphics"
#define DRIVER_NAME "sis"
#define DRIVER_DESC "SIS 300/630/540"
-#define DRIVER_DATE "20060619"
+#define DRIVER_DATE "20060704"
#define DRIVER_MAJOR 1
#define DRIVER_MINOR 2
#define DRIVER_PATCHLEVEL 1
+enum sis_family {
+ SIS_OTHER = 0,
+ SIS_CHIP_315 = 1,
+};
+
#if defined(__linux__)
#define SIS_HAVE_CORE_MM
#endif
#ifdef SIS_HAVE_CORE_MM
-
#include "drm_sman.h"
+
+#define SIS_BASE (dev_priv->mmio)
+#define SIS_READ(reg) DRM_READ32(SIS_BASE, reg);
+#define SIS_WRITE(reg, val) DRM_WRITE32(SIS_BASE, reg, val);
+
typedef struct drm_sis_private {
drm_local_map_t *mmio;
unsigned idle_fault;
@@ -57,6 +66,7 @@ typedef struct drm_sis_private {
unsigned long agp_offset;
} drm_sis_private_t;
+extern int sis_idle(drm_device_t *dev);
extern void sis_reclaim_buffers_locked(drm_device_t *dev, struct file *filp);
extern void sis_lastclose(drm_device_t *dev);