diff options
| -rw-r--r-- | man/intel.man | 13 | ||||
| -rw-r--r-- | src/i830_driver.c | 22 |
2 files changed, 25 insertions, 10 deletions
diff --git a/man/intel.man b/man/intel.man index 178ff0a6..daf90307 100644 --- a/man/intel.man +++ b/man/intel.man @@ -43,17 +43,10 @@ NetBSD, and Solaris have such kernel drivers available. By default, the i810 will use 8 megabytes of system memory for graphics. For the 830M and later, the driver will automatically size its memory allocation according to the features it will -support. The amount of memory used may be limited by using the +support. The .B VideoRam -entry in the config file -.B "Device" -section. Limiting the amount of memory used may result in features being -disabled, so if you choose to configure it, it is advisable to check the -__xservername__ -log file to see if any features have been disabled because of insufficient -video memory. In particular, DRI support or tiling mode may be disabled -with insufficient video memory. Either of these being disabled will -reduce performance for 3D applications. +option, which in the past had been necessary to allow more than some small +amount of memory to be allocated, is now ignored. .PP The following driver .B Options diff --git a/src/i830_driver.c b/src/i830_driver.c index e38b77b5..4990b8f6 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2162,8 +2162,30 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) from = X_DEFAULT; pScrn->videoRam = pI830->FbMapSize / KB(1); } else { +#if 0 from = X_CONFIG; pScrn->videoRam = pI830->pEnt->device->videoRam; +#else + /* Disable VideoRam configuration, at least for now. Previously, + * VideoRam was necessary to avoid overly low limits on allocated + * memory, so users created larger, yet still small, fixed allocation + * limits in their config files. Now, the driver wants to allocate more, + * and the old intention of the VideoRam lines that had been entered is + * obsolete. + */ + from = X_DEFAULT; + pScrn->videoRam = pI830->FbMapSize / KB(1); + + if (pScrn->videoRam != pI830->pEnt->device->videoRam) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "VideoRam configuration found, which is no longer " + "recommended.\n"); + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Continuing with default %dkB VideoRam instead of %d " + "kB.\n", + pScrn->videoRam, pI830->pEnt->device->videoRam); + } +#endif } /* Limit videoRam to how much we might be able to allocate from AGP */ |