[Intel-gfx] [PATCH] Disable XvMC on 915G/GM in KMS

[Zhenyu Wang]

On 2009.06.25 09:51:12 +0800, Zhenyu Wang wrote:
> 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 at linux.intel.com>
> ---
>  src/i830_hwmc.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/src/i830_hwmc.c b/src/i830_hwmc.c
> index 75bf2e6..b377412 100644
> --- a/src/i830_hwmc.c
> +++ b/src/i830_hwmc.c
> @@ -55,6 +55,9 @@ Bool intel_xvmc_probe(ScrnInfoPtr pScrn)
>      if (!pI830->XvMCEnabled)
>  	return FALSE;
>  
> +    if (pI830->use_drm_mode && IS_I915(pI830))
> +	return FALSE;
> +
>      if (IS_I9XX(pI830)) {
>  	if (IS_I915(pI830))
>  	    ret = intel_xvmc_set_driver(&i915_xvmc_driver);
> -- 
> 1.6.3.1

Oops. Only 915G/GM must require physical address for XvMC.

From 91e97ce3fbbd5a1f05807bb848a8c200d1840812 Mon Sep 17 00:00:00 2001
From: Zhenyu Wang <zhenyuw at linux.intel.com>
Date: Thu, 25 Jun 2009 10:22:23 +0800
Subject: [PATCH] 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 at linux.intel.com>
---
 src/i830_hwmc.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/i830_hwmc.c b/src/i830_hwmc.c
index 75bf2e6..dee17ca 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);
-- 
1.6.3.1

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20090625/a191ed24/attachment.sig>