[Openchrome-devel] [PATCH] VM800 and similar are using a CME video engine

[Xavier Bachelot]

---
 src/via_driver.c     | 1 +
 src/via_xv_overlay.c | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/via_driver.c b/src/via_driver.c
index d9e940f..1d2cddb 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -703,6 +703,7 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
         case VIA_VM800:
             /* New mode switch resolve bug with gamma set #282 */
             /* and with Xv after hibernate #240                */
+            pVia->VideoEngine = VIDEO_ENGINE_CME;
             break;
         case VIA_CX700:
             pVia->VideoEngine = VIDEO_ENGINE_CME;
diff --git a/src/via_xv_overlay.c b/src/via_xv_overlay.c
index f23fa0b..5c0fec8 100644
--- a/src/via_xv_overlay.c
+++ b/src/via_xv_overlay.c
@@ -1869,8 +1869,7 @@ Upd_Video(xf86CrtcPtr crtc, unsigned long videoFlag,
     /*
      * Enable video on secondary
      */
-    if ((pVia->VideoEngine == VIDEO_ENGINE_CME ||
-         pVia->Chipset == VIA_VM800) && iga->index) {
+    if (pVia->VideoEngine == VIDEO_ENGINE_CME && iga->index) {
         /* V1_ON_SND_DISPLAY */
         vidCtl |= V1_ON_SND_DISPLAY;
         /* SECOND_DISPLAY_COLOR_KEY_ENABLE */
-- 
1.7.11.4

-------------- next part --------------