From 6bacb180cef00573fc41a1e79bdd5b89d6f1c1f5 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Tue, 6 Jun 2006 14:19:00 +0000 Subject: Merge in the drm-sman-branch --- shared-core/sis_drv.h | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'shared-core/sis_drv.h') diff --git a/shared-core/sis_drv.h b/shared-core/sis_drv.h index e218e526..037bc49d 100644 --- a/shared-core/sis_drv.h +++ b/shared-core/sis_drv.h @@ -34,11 +34,32 @@ #define DRIVER_AUTHOR "SIS" #define DRIVER_NAME "sis" #define DRIVER_DESC "SIS 300/630/540" -#define DRIVER_DATE "20030826" +#define DRIVER_DATE "20060529" #define DRIVER_MAJOR 1 -#define DRIVER_MINOR 1 +#define DRIVER_MINOR 2 #define DRIVER_PATCHLEVEL 0 +#if defined(__linux__) +#define SIS_HAVE_CORE_MM +#endif + +#ifdef SIS_HAVE_CORE_MM + +#include "drm_sman.h" +typedef struct drm_sis_private { + drm_local_map_t *mmio; + unsigned idle_fault; + drm_sman_t sman; + unsigned long chipset; + int vram_initialized; + int agp_initialized; + unsigned long vram_offset; + unsigned long agp_offset; +} drm_sis_private_t; + +extern void sis_reclaim_buffers_locked(drm_device_t *dev, struct file *filp); + +#else #include "sis_ds.h" typedef struct drm_sis_private { @@ -47,6 +68,10 @@ typedef struct drm_sis_private { } drm_sis_private_t; extern int sis_init_context(drm_device_t * dev, int context); + +#endif + + extern int sis_final_context(drm_device_t * dev, int context); extern drm_ioctl_desc_t sis_ioctls[]; -- cgit v1.2.3