Index: src/via_xvmc.c
===================================================================
--- src/via_xvmc.c	(revision 826)
+++ src/via_xvmc.c	(working copy)
@@ -326,9 +326,7 @@ ViaInitXVMC(ScreenPtr pScreen)
     if ((pVia->Chipset == VIA_KM400) ||
         (pVia->Chipset == VIA_CX700) ||
         (pVia->Chipset == VIA_VX800) ||
-        (pVia->Chipset == VIA_VX855) ||
-        (pVia->Chipset == VIA_K8M890) ||
-        (pVia->Chipset == VIA_P4M900)) {
+        (pVia->Chipset == VIA_VX855)) {
         xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
                    "[XvMC] XvMC is not supported on this chipset.\n");
         return;
@@ -376,18 +374,22 @@ ViaInitXVMC(ScreenPtr pScreen)
     {
         DRIInfoPtr pDRIInfo = pVia->pDRIInfo;
 
-        if (pVia->ChipId != PCI_CHIP_VT3259 &&
-            pVia->ChipId != PCI_CHIP_VT3364) {
-            xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                       "[XvMC] Registering chromeXvMC.\n");
-            xf86XvMCRegisterDRInfo(pScreen, "chromeXvMC", pDRIInfo->busIdString,
-                                   VIAXVMC_MAJOR, VIAXVMC_MINOR, VIAXVMC_PL);
-        } else {
-            xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-                       "[XvMC] Registering chromeXvMCPro.\n");
-            xf86XvMCRegisterDRInfo(pScreen, "chromeXvMCPro",
-                                   pDRIInfo->busIdString, VIAXVMC_MAJOR,
-                                   VIAXVMC_MINOR, VIAXVMC_PL);
+        switch (pVia->ChipId) {
+            case PCI_CHIP_VT3259:
+            case PCI_CHIP_VT3364:
+                xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                           "[XvMC] Registering chromeXvMCPro.\n");
+                xf86XvMCRegisterDRInfo(pScreen, "chromeXvMCPro",
+                                       pDRIInfo->busIdString, VIAXVMC_MAJOR,
+                                       VIAXVMC_MINOR, VIAXVMC_PL);
+                break;
+            default:
+                xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+                           "[XvMC] Registering chromeXvMC.\n");
+                xf86XvMCRegisterDRInfo(pScreen, "chromeXvMC",
+                                       pDRIInfo->busIdString, VIAXVMC_MAJOR,
+                                       VIAXVMC_MINOR, VIAXVMC_PL);
+                break;
         }
     }
 #endif