diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2007-11-29 23:12:16 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2007-11-29 23:12:16 +0800 |
| commit | 3cf862717688aa679b5e667cd041ddd6f5db0b58 (patch) | |
| tree | eb5b218354c9ccf78848b26d028004fa647079fe /src/i830_hwmc.c | |
| parent | 6da4b7a80cdf730018435fe84485ecdad62bc860 (diff) | |
xvmc: add "XvMC" option, default is false.
Diffstat (limited to 'src/i830_hwmc.c')
| -rw-r--r-- | src/i830_hwmc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/i830_hwmc.c b/src/i830_hwmc.c index 721616c1..189c2e56 100644 --- a/src/i830_hwmc.c +++ b/src/i830_hwmc.c @@ -52,6 +52,9 @@ Bool intel_xvmc_probe(ScrnInfoPtr pScrn) I830Ptr pI830 = I830PTR(pScrn); Bool ret = FALSE; + if (!pI830->XvMCEnabled) + return FALSE; + if (IS_I9XX(pI830)) { if (!IS_I965G(pI830)) ret = intel_xvmc_set_driver(&i915_xvmc_driver); @@ -101,7 +104,6 @@ Bool intel_xvmc_screen_init(ScreenPtr pScreen) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[XvMC] %s driver initialized.\n", xvmc_driver->name); - pI830->XvMCEnabled = TRUE; } else { intel_xvmc_finish(pScrn); pI830->XvMCEnabled = FALSE; |