diff options
| author | Thomas Hellstrom <thomas@tungstengraphics.com> | 2006-06-15 18:37:05 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <thomas@tungstengraphics.com> | 2006-06-15 18:37:05 +0000 |
| commit | ca1a77683d523dc1d2268531b19ea23b3e1ae4f0 (patch) | |
| tree | 44c16397e56d92df29317e11d73343a404762a66 /shared-core | |
| parent | 6c7faf5814547169dec2b865abf1f63b83aaeb05 (diff) | |
via:
-Remove out of memory error message.
-Move sman cleanup from final_context to lastclose.
-Add the P4VM800PRO (?) PCI ID.
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/drm_pciids.txt | 1 | ||||
| -rw-r--r-- | shared-core/via_drm.h | 4 | ||||
| -rw-r--r-- | shared-core/via_drv.c | 1 | ||||
| -rw-r--r-- | shared-core/via_drv.h | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt index c1289c3e..a86e4a24 100644 --- a/shared-core/drm_pciids.txt +++ b/shared-core/drm_pciids.txt @@ -217,6 +217,7 @@ 0x1106 0x3122 0 "VIA CLE266" 0x1106 0x7205 0 "VIA KM400" 0x1106 0x3108 0 "VIA K8M800" +0x1106 0x3344 0 "VIA P4VM800PRO" [i810] 0x8086 0x7121 0 "Intel i810 GMCH" diff --git a/shared-core/via_drm.h b/shared-core/via_drm.h index 4be7e249..cd3d5666 100644 --- a/shared-core/via_drm.h +++ b/shared-core/via_drm.h @@ -42,11 +42,11 @@ * backwards incompatibilities, (which should be avoided whenever possible). */ -#define VIA_DRM_DRIVER_DATE "20060528" +#define VIA_DRM_DRIVER_DATE "20060615" #define VIA_DRM_DRIVER_MAJOR 2 #define VIA_DRM_DRIVER_MINOR 10 -#define VIA_DRM_DRIVER_PATCHLEVEL 0 +#define VIA_DRM_DRIVER_PATCHLEVEL 1 #define VIA_DRM_DRIVER_VERSION (((VIA_DRM_DRIVER_MAJOR) << 16) | (VIA_DRM_DRIVER_MINOR)) #define VIA_NR_SAREA_CLIPRECTS 8 diff --git a/shared-core/via_drv.c b/shared-core/via_drv.c index a7509cff..bacfe37d 100644 --- a/shared-core/via_drv.c +++ b/shared-core/via_drv.c @@ -60,6 +60,7 @@ static struct drm_driver driver = { .reclaim_buffers = drm_core_reclaim_buffers, #ifdef VIA_HAVE_CORE_MM .reclaim_buffers_locked = via_reclaim_buffers_locked, + .lastclose = via_lastclose, #endif .get_map_ofs = drm_core_get_map_ofs, .get_reg_ofs = drm_core_get_reg_ofs, diff --git a/shared-core/via_drv.h b/shared-core/via_drv.h index 2e9e10c3..86cd049d 100644 --- a/shared-core/via_drv.h +++ b/shared-core/via_drv.h @@ -153,6 +153,7 @@ extern int via_driver_irq_wait(drm_device_t * dev, unsigned int irq, #ifdef VIA_HAVE_CORE_MM extern void via_reclaim_buffers_locked(drm_device_t *dev, struct file *filp); +extern void via_lastclose(drm_device_t *dev); #else extern int via_init_context(drm_device_t * dev, int context); #endif |