summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhenyu Wang <zhenyuw@linux.intel.com>2009-06-25 10:22:23 +0800
committerZhenyu Wang <zhenyuw@linux.intel.com>2009-06-29 13:44:58 +0800
commitf53b3239dbc0ed723774e386e07ac9d8ce96bb89 (patch)
tree29dc1c4e9b2d9612d267df649dd2ae9e0a72a08b
parentf0270bbb47baed78a0ff6189ae20d3ac322ec02b (diff)
Disable XvMC on 915G/GM in KMS
These chips require physical address for XvMC surface, which is not available in KMS case. Instead of crashing X, disable it now. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
-rw-r--r--src/i830_hwmc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/i830_hwmc.c b/src/i830_hwmc.c
index 75bf2e60..dee17caf 100644
--- a/src/i830_hwmc.c
+++ b/src/i830_hwmc.c
@@ -55,6 +55,10 @@ Bool intel_xvmc_probe(ScrnInfoPtr pScrn)
if (!pI830->XvMCEnabled)
return FALSE;
+ if (pI830->use_drm_mode &&
+ (IS_I915G(pI830) || IS_I915GM(pI830)))
+ return FALSE;
+
if (IS_I9XX(pI830)) {
if (IS_I915(pI830))
ret = intel_xvmc_set_driver(&i915_xvmc_driver);