diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-03-11 14:37:41 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-03-11 14:37:41 +0800 |
| commit | 31654f52b084ebb32f69854dfb1c342c9da07928 (patch) | |
| tree | 415cb1ba373cc815964bd2441aa546ebd5f74a9f /man | |
| parent | a03aca101d4d51ed2279a99d1137ce3b7ef364e2 (diff) | |
| parent | 02c0ffb1d8112a6fb03f9c8eae9ec1a1fca123ef (diff) | |
Merge branch 'master' into xvmc
Conflicts:
man/intel.man
src/i830_driver.c
Diffstat (limited to 'man')
| -rw-r--r-- | man/Makefile.am | 1 | ||||
| -rw-r--r-- | man/intel.man | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/man/Makefile.am b/man/Makefile.am index b5510e8d..7432d5a3 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,4 +1,3 @@ -# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff --git a/man/intel.man b/man/intel.man index c048f01e..b9b64b9c 100644 --- a/man/intel.man +++ b/man/intel.man @@ -176,6 +176,13 @@ Default: "EXA". Enable printing of additional debugging information about modesetting to the server log. .TP +.BI "Option \*qForceEnablePipeA\*q \*q" boolean \*q +Force the driver to leave pipe A enabled. May be necessary in configurations +where the BIOS accesses pipe registers during display hotswitch or lid close, +causing a crash. If you find that your platform needs this option, please file +a bug against xf86-video-intel at http://bugs.freedesktop.org which includes +the output of 'lspci -v' and 'lspci -vn'. +.TP .BI "Option \*qXvMC\*q \*q" boolean \*q Enable XvMC driver. Current support MPEG2 MC on 915/945 and G33 series. User should provide absolute path to libIntelXvMC.so in XvMCConfig file. |