diff options
author | Xiang Hai hao <haihao.xiang@intel.com> | 2009-05-18 17:12:30 +0800 |
---|---|---|
committer | Zou Nan hai <nanhai.zou@intel.com> | 2009-05-18 17:12:30 +0800 |
commit | b622860429e00d6ab4407980232659c283a8fe8d (patch) | |
tree | 21892df1406bfc1b9cfc3f0d8ea2e74e9927c367 /src/i830_driver.c | |
parent | 50c10ededba15dd0c118f1b65756362061491090 (diff) |
DRI2 for XvMC
Diffstat (limited to 'src/i830_driver.c')
-rw-r--r-- | src/i830_driver.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 854ad0fb..1061d44a 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2767,8 +2767,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) #ifdef INTEL_XVMC pI830->XvMCEnabled = FALSE; - from = xf86GetOptValBool(pI830->Options, OPTION_XVMC, - &pI830->XvMCEnabled) ? X_CONFIG : X_DEFAULT; + from = ((pI830->directRenderingType == DRI_DRI2) && + 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 |