diff options
| author | root <root@hdmi.sh.intel.com> | 2009-06-04 10:27:41 +0800 |
|---|---|---|
| committer | root <root@hdmi.sh.intel.com> | 2009-06-04 10:27:41 +0800 |
| commit | 4d9f3a21ab9b2737fe7a5a088c2da1b0c2be7f04 (patch) | |
| tree | 5afa1f5fb4be9abbfb788f495ecc100e21cbd0b8 /src/i830_driver.c | |
| parent | b8e360bf2b77d28559d15a7c0f9c766848eb6ced (diff) | |
| parent | 52054b6a4c1ca5117c9750361f71aedd91220c39 (diff) | |
Merge branch 'xvmc-vld'
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 8375e944..73d350f8 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2816,8 +2816,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 |