| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-03-18 08:52:29 (GMT) |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-03-18 08:52:29 (GMT) |
| commit | ac763634069fe070b3afc073ce437959612d39fe (patch) | |
| tree | c2992349c3fee1fb66bcfc771e506e66611f02a4 | |
| parent | f425181695b1b3864373e1919cf651229f19fa69 (diff) | |
| download | xf86-video-intel-ac763634069fe070b3afc073ce437959612d39fe.zip xf86-video-intel-ac763634069fe070b3afc073ce437959612d39fe.tar.gz xf86-video-intel-ac763634069fe070b3afc073ce437959612d39fe.tar.bz2 | |
Disable XvMC if DRI is not enabled.
Default XvMC to disabled.
| -rw-r--r-- | man/intel.man | 2 | ||||
| -rw-r--r-- | src/i830_driver.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/man/intel.man b/man/intel.man index b9b64b9..c26264f 100644 --- a/man/intel.man +++ b/man/intel.man @@ -186,7 +186,7 @@ the output of 'lspci -v' and 'lspci -vn'. .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. -Default: Enabled. +Default: Disabled. .SH OUTPUT CONFIGURATION On 830M and better chipsets, the driver supports runtime configuration of diff --git a/src/i830_driver.c b/src/i830_driver.c index 3938e74..a40d8ce 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1632,8 +1632,11 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) #endif #ifdef INTEL_XVMC - pI830->XvMCEnabled = xf86ReturnOptValBool(pI830->Options, OPTION_XVMC, TRUE); - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Intel XvMC decoder %sabled\n", + pI830->XvMCEnabled = FALSE; + from = (!pI830->directRenderingDisabled && + xf86GetOptValBool(pI830->Options, OPTION_XVMC, + &pI830->XvMCEnabled)) ? X_CONFIG : X_DEFAULT; + xf86DrvMsg(pScrn->scrnIndex, from, "Intel XvMC decoder %sabled\n", pI830->XvMCEnabled ? "en" : "dis"); #endif |