diff options
| author | Thomas Hellstrom <thomas@tungstengraphics.com> | 2006-08-08 21:34:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-09-22 05:32:31 +1000 |
| commit | 7981bf7d494a6c4d45e22c54b0da887e5a67e705 (patch) | |
| tree | 2cf27c4def2875d2463050056def16736189f5f3 /drivers/char/drm/sis_drv.h | |
| parent | 8d153f7107ff2c5d6e32053ae377c961187ab6b9 (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.h | 12 |
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 @@ #define DRIVER_AUTHOR "SIS, Tungsten Graphics" #define DRIVER_NAME "sis" #define DRIVER_DESC "SIS 300/630/540" -#define DRIVER_DATE "20060529" +#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, +}; + #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 int idle_fault; @@ -52,6 +61,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); |