diff options
| author | Dave Airlie <airlied@optimus.localdomain> | 2006-12-20 10:30:16 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-12-20 10:30:16 +1100 |
| commit | e5c4a26a29a9af301cb8b0aebbba84e70f995b83 (patch) | |
| tree | 3eba66ce42ce7c3d2d9ced2d726b9ca5d553843a /linux-core/drm_fops.c | |
| parent | 3b7508d1bf2c78f19d882beffa6d8b4f58bd19a8 (diff) | |
| parent | dc1b68aacbfc8d53d78f7388e0e52da1747a1f71 (diff) | |
Merge branch 'nouveau-1'
Diffstat (limited to 'linux-core/drm_fops.c')
| -rw-r--r-- | linux-core/drm_fops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c index ac205730..84e06c87 100644 --- a/linux-core/drm_fops.c +++ b/linux-core/drm_fops.c @@ -46,7 +46,7 @@ static int drm_setup(drm_device_t * dev) drm_local_map_t *map; int i; int ret; - + int sareapage; if (dev->driver->firstopen) { ret = dev->driver->firstopen(dev); @@ -57,8 +57,8 @@ static int drm_setup(drm_device_t * dev) dev->magicfree.next = NULL; /* prebuild the SAREA */ - - i = drm_addmap(dev, 0, SAREA_MAX, _DRM_SHM, _DRM_CONTAINS_LOCK, &map); + sareapage = max(SAREA_MAX, PAGE_SIZE); + i = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK, &map); if (i != 0) return i; |