aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/sis_drv.h
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas@tungstengraphics.com>2006-08-08 07:34:46 -0400
committerDave Airlie <airlied@linux.ie>2006-09-21 15:32:31 -0400
commit7981bf7d494a6c4d45e22c54b0da887e5a67e705 (patch)
tree2cf27c4def2875d2463050056def16736189f5f3 /drivers/char/drm/sis_drv.h
parent8d153f7107ff2c5d6e32053ae377c961187ab6b9 (diff)
drm: SiS 315 Awareness.
Add support for the SiS 315 to the DRM. Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/sis_drv.h')
-rw-r--r--drivers/char/drm/sis_drv.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/char/drm/sis_drv.h b/drivers/char/drm/sis_drv.h
index 330a2c4eade2..2b8d6f6ed7c0 100644
--- a/drivers/char/drm/sis_drv.h
+++ b/drivers/char/drm/sis_drv.h
@@ -34,13 +34,22 @@
34#define DRIVER_AUTHOR "SIS, Tungsten Graphics" 34#define DRIVER_AUTHOR "SIS, Tungsten Graphics"
35#define DRIVER_NAME "sis" 35#define DRIVER_NAME "sis"
36#define DRIVER_DESC "SIS 300/630/540" 36#define DRIVER_DESC "SIS 300/630/540"
37#define DRIVER_DATE "20060529" 37#define DRIVER_DATE "20060704"
38#define DRIVER_MAJOR 1 38#define DRIVER_MAJOR 1
39#define DRIVER_MINOR 2 39#define DRIVER_MINOR 2
40#define DRIVER_PATCHLEVEL 1 40#define DRIVER_PATCHLEVEL 1
41 41
42enum sis_family {
43 SIS_OTHER = 0,
44 SIS_CHIP_315 = 1,
45};
46
42#include "drm_sman.h" 47#include "drm_sman.h"
43 48
49#define SIS_BASE (dev_priv->mmio)
50#define SIS_READ(reg) DRM_READ32(SIS_BASE, reg);
51#define SIS_WRITE(reg, val) DRM_WRITE32(SIS_BASE, reg, val);
52
44typedef struct drm_sis_private { 53typedef struct drm_sis_private {
45 drm_local_map_t *mmio; 54 drm_local_map_t *mmio;
46 unsigned int idle_fault; 55 unsigned int idle_fault;
@@ -52,6 +61,7 @@ typedef struct drm_sis_private {
52 unsigned long agp_offset; 61 unsigned long agp_offset;
53} drm_sis_private_t; 62} drm_sis_private_t;
54 63
64extern int sis_idle(drm_device_t *dev);
55extern void sis_reclaim_buffers_locked(drm_device_t *dev, struct file *filp); 65extern void sis_reclaim_buffers_locked(drm_device_t *dev, struct file *filp);
56extern void sis_lastclose(drm_device_t *dev); 66extern void sis_lastclose(drm_device_t *dev);
57 67