Make DRM permanent maps match broken X behavior. X is mapping regions that

    are both smaller and larger than what the hardware supports. If DRM
    tries to fix these requests X will fail.

diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c
index f48ef6f..5058a1d 100644 (file)
--- a/linux-core/drm_bufs.c
+++ b/linux-core/drm_bufs.c
@@ -190,6 +190,7 @@ int DRM(addmap)( struct inode *inode, struct file *filp,
                                        _entry->map->offset, _entry->map->size, _entry->map->type );
                                if ( _entry->map && map->type == _entry->map->type  &&
                                                map->offset == _entry->map->offset ) {
+                                       _entry->map->size = map->size;
                                        DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );
                                        map = _entry->map;
                                        DRM_DEBUG( "Found existing: offset = 0x%08lx, size = 0x%08lx, type = %d\n",

diff --git a/linux/drm_bufs.h b/linux/drm_bufs.h
index f48ef6f..5058a1d 100644 (file)
--- a/linux/drm_bufs.h
+++ b/linux/drm_bufs.h
@@ -190,6 +190,7 @@ int DRM(addmap)( struct inode *inode, struct file *filp,
                                        _entry->map->offset, _entry->map->size, _entry->map->type );
                                if ( _entry->map && map->type == _entry->map->type  &&
                                                map->offset == _entry->map->offset ) {
+                                       _entry->map->size = map->size;
                                        DRM(free)( map, sizeof(*map), DRM_MEM_MAPS );
                                        map = _entry->map;
                                        DRM_DEBUG( "Found existing: offset = 0x%08lx, size = 0x%08lx, type = %d\n",