diff options
author | Jon Smirl <jonsmirl@yahoo.com> | 2004-09-21 05:13:21 +0000 |
---|---|---|
committer | Jon Smirl <jonsmirl@yahoo.com> | 2004-09-21 05:13:21 +0000 |
commit | 2ad068005aa9785dd86e0023354f68e970f04e9f (patch) | |
tree | d687e0946a6e30f8ccd44bd91fd06960faa5ff7c | |
parent | 6f31c42fe923ff3f79a55d8c859e6ccfd3bd322d (diff) |
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.
-rw-r--r-- | linux-core/drm_bufs.c | 1 | ||||
-rw-r--r-- | linux/drm_bufs.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c index f48ef6f1..5058a1d3 100644 --- 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 f48ef6f1..5058a1d3 100644 --- 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", |