Attachment 119668 Details for Bug 92861 – This patch eliminates references to non-existent VM800 chipset in the source code

[patch] This patch eliminates references to non-existent VM800 chipset in the source code

VM800_VN800_P4M800_Pro_Correction.patch (text/plain), 29.55 KB, created by Kevin Brace on 2015-11-15 06:05:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Brace

Created: 2015-11-15 06:05:53 UTC

Size: 29.55 KB

patch

obsolete

>commit f1ed828bda02e9dc56f62be0bd1171ddf0cff197
>Author: Kevin Brace <kevinbrace@gmx.com>
>Date:   Sat Nov 14 20:57:13 2015 -0800
>
>    Replaces VIA_VM800 label with VIA_P4M800PRO label inside via_driver.c
>    due to the fact that there is no such product as VM800 chipset from
>    VIA Technologies. The VM800 chipset the source code refers to really
>    is P4M800 Pro chipset. Also, the source code refers to a product
>    called VN800 chipset, and this is similar (related) to P4M800 Pro
>    chipset.
>        Made an improvement in supported device message recorded by
>    Xorg.0.log.
>        Other than that, there is no change in terms of the
>    device driver functionality. The compiled device driver was tested
>    on the following computer.
>    
>     - Epic 1314 laptop (MSI VR321 laptop equivalent, VN896 chipset)
>       with Lubuntu 12.04 i386
>
>diff --git a/src/via_bandwidth.c b/src/via_bandwidth.c
>index c33bce5..390cbd1 100644
>--- a/src/via_bandwidth.c
>+++ b/src/via_bandwidth.c
>@@ -1,4 +1,5 @@
> /*
>+ * Copyright 2015 Kevin Brace
>  * Copyright 2005-2015 The Openchrome Project
>  *                     [http://www.freedesktop.org/wiki/Openchrome]
>  * Copyright 2004-2005 The Unichrome Project  [unichrome.sf.net]
>@@ -193,7 +194,6 @@ ViaSetPrimaryFIFO(ScrnInfoPtr pScrn, DisplayModePtr mode)
>             else
>                 ViaSeqMask(hwp, 0x22, 0x00, 0x1F);  /* 128/4 = overflow = 0 */
>             break;
>-        /* PM800/PM880/CN400 */
>         case VIA_PM800:
>             hwp->writeSeq(hwp, 0x17, 0x5F);     /* 95 */
>             ViaSeqMask(hwp, 0x16, 0x20, 0xBF);  /* 32 */
>@@ -204,8 +204,7 @@ ViaSetPrimaryFIFO(ScrnInfoPtr pScrn, DisplayModePtr mode)
>             else
>                 ViaSeqMask(hwp, 0x22, 0x1F, 0x1F);  /* 31 */
>             break;
>-        /* P4M800Pro/VN800/CN700 */ 
>-        case VIA_VM800:
>+        case VIA_P4M800PRO:
>             hwp->writeSeq(hwp, 0x17, 0x2F);
>             ViaSeqMask(hwp, 0x16, 0x14, 0xBF);  /* 80/4    = 20  = 0x14 */
>             ViaSeqMask(hwp, 0x18, 0x08, 0xBF);
>@@ -375,7 +374,7 @@ ViaSetSecondaryFIFO(ScrnInfoPtr pScrn, DisplayModePtr mode)
>             else
>                 ViaCrtcMask(hwp, 0x94, 0x20, 0x7F);  /* 128/4 */
>             break;
>-        case VIA_VM800:
>+        case VIA_P4M800PRO:
>             ViaCrtcMask(hwp, 0x68, 0xA0, 0xF0);
>             ViaCrtcMask(hwp, 0x94, 0x00, 0x80);
>             ViaCrtcMask(hwp, 0x95, 0x00, 0x80);
>diff --git a/src/via_display.c b/src/via_display.c
>index ea2920b..02353ee 100644
>--- a/src/via_display.c
>+++ b/src/via_display.c
>@@ -1,4 +1,5 @@
> /*
>+ * Copyright 2015 Kevin Brace
>  * Copyright 2005-2015 The Openchrome Project
>  *                     [http://www.freedesktop.org/wiki/Openchrome]
>  * Copyright 2004-2005 The Unichrome Project  [unichrome.sf.net]
>@@ -1798,7 +1799,7 @@ UMSCrtcInit(ScrnInfoPtr pScrn)
>     case VIA_KM400:
>     case VIA_K8M800:
>     case VIA_PM800:
>-    case VIA_VM800:
>+    case VIA_P4M800PRO:
>         max_pitch = 3344;
>         max_height = 2508;
>         break;
>diff --git a/src/via_driver.c b/src/via_driver.c
>index 649bf99..8e83383 100644
>--- a/src/via_driver.c
>+++ b/src/via_driver.c
>@@ -1,4 +1,5 @@
> /*
>+ * Copyright 2015 Kevin Brace
>  * Copyright 2005-2015 The Openchrome Project
>  *                     [http://www.freedesktop.org/wiki/Openchrome]
>  * Copyright 2004-2006 Luc Verhaegen.
>@@ -127,36 +128,36 @@ _X_EXPORT DriverRec VIA = {
> 
> /* Supported chipsets */
> static SymTabRec VIAChipsets[] = {
>-    {VIA_CLE266,   "CLE266"},
>-    {VIA_KM400,    "KM400/KN400"},
>-    {VIA_K8M800,   "K8M800/K8N800"},
>-    {VIA_PM800,    "PM800/PM880/CN400"},
>-    {VIA_VM800,    "VM800/P4M800Pro/VN800/CN700"},
>-    {VIA_CX700,    "CX700/VX700"},
>-    {VIA_K8M890,   "K8M890/K8N890"},
>-    {VIA_P4M890,   "P4M890"},
>-    {VIA_P4M900,   "P4M900/VN896/CN896"},
>-    {VIA_VX800,    "VX800/VX820"},
>-    {VIA_VX855,    "VX855/VX875"},
>-    {VIA_VX900,    "VX900"},
>-    {-1,            NULL }
>+    {VIA_CLE266,       "CLE266"},
>+    {VIA_KM400,        "KM400 / KM400A / KN400 / P4M800"},
>+    {VIA_K8M800,       "K8M800 / K8N800"},
>+    {VIA_PM800,        "PM800 / PN800 / PM880 / CN400"},
>+    {VIA_P4M800PRO,    "P4M800 Pro / VN800 / CN700"},
>+    {VIA_CX700,        "CX700 / VX700"},
>+    {VIA_P4M890,       "P4M890 / CN800"},
>+    {VIA_K8M890,       "K8M890 / K8N890"},
>+    {VIA_P4M900,       "P4M900 / VN896 / CN896"},
>+    {VIA_VX800,        "VX800 / VX820"},
>+    {VIA_VX855,        "VX855 / VX875"},
>+    {VIA_VX900,        "VX900"},
>+    {-1,               NULL }
> };
> 
> /* Mapping a PCI device ID to a chipset family identifier. */
> static PciChipsets VIAPciChipsets[] = {
>-    {VIA_CLE266,   PCI_CHIP_CLE3122,   VIA_RES_SHARED},
>-    {VIA_KM400,    PCI_CHIP_VT3205,    VIA_RES_SHARED},
>-    {VIA_K8M800,   PCI_CHIP_VT3204,    VIA_RES_SHARED},
>-    {VIA_PM800,    PCI_CHIP_VT3259,    VIA_RES_SHARED},
>-    {VIA_VM800,    PCI_CHIP_VT3314,    VIA_RES_SHARED},
>-    {VIA_CX700,    PCI_CHIP_VT3324,    VIA_RES_SHARED},
>-    {VIA_K8M890,   PCI_CHIP_VT3336,    VIA_RES_SHARED},
>-    {VIA_P4M890,   PCI_CHIP_VT3327,    VIA_RES_SHARED},
>-    {VIA_P4M900,   PCI_CHIP_VT3364,    VIA_RES_SHARED},
>-    {VIA_VX800,    PCI_CHIP_VT3353,    VIA_RES_SHARED},
>-    {VIA_VX855,    PCI_CHIP_VT3409,    VIA_RES_SHARED},
>-    {VIA_VX900,    PCI_CHIP_VT3410,    VIA_RES_SHARED},
>-    {-1,           -1,                 VIA_RES_UNDEF}
>+    {VIA_CLE266,       PCI_CHIP_CLE3122,   VIA_RES_SHARED},
>+    {VIA_KM400,        PCI_CHIP_VT3205,    VIA_RES_SHARED},
>+    {VIA_K8M800,       PCI_CHIP_VT3204,    VIA_RES_SHARED},
>+    {VIA_PM800,        PCI_CHIP_VT3259,    VIA_RES_SHARED},
>+    {VIA_P4M800PRO,    PCI_CHIP_VT3314,    VIA_RES_SHARED},
>+    {VIA_CX700,        PCI_CHIP_VT3324,    VIA_RES_SHARED},
>+    {VIA_P4M890,       PCI_CHIP_VT3327,    VIA_RES_SHARED},
>+    {VIA_K8M890,       PCI_CHIP_VT3336,    VIA_RES_SHARED},
>+    {VIA_P4M900,       PCI_CHIP_VT3364,    VIA_RES_SHARED},
>+    {VIA_VX800,        PCI_CHIP_VT3353,    VIA_RES_SHARED},
>+    {VIA_VX855,        PCI_CHIP_VT3409,    VIA_RES_SHARED},
>+    {VIA_VX900,        PCI_CHIP_VT3410,    VIA_RES_SHARED},
>+    {-1,               -1,                 VIA_RES_UNDEF}
> };
> 
> typedef enum
>@@ -707,7 +708,7 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
>             /* FIXME The video playing (XV) is not working correctly after turn on new mode switch */
>             pVia->VideoEngine = VIDEO_ENGINE_CME;
>             break;
>-        case VIA_VM800:
>+        case VIA_P4M800PRO:
>             /* New mode switch resolve bug with gamma set #282 */
>             /* and with Xv after hibernate #240                */
>             break;
>diff --git a/src/via_i2c.c b/src/via_i2c.c
>index 6c11cfd..ffc062f 100644
>--- a/src/via_i2c.c
>+++ b/src/via_i2c.c
>@@ -1,4 +1,5 @@
> /*
>+ * Copyright 2015 Kevin Brace
>  * Copyright 2004 The Unichrome Project  [unichrome.sf.net]
>  * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
>  * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
>@@ -347,7 +348,7 @@ ViaI2CBus3Init(ScrnInfoPtr pScrn)
>     pI2CBus->DriverPrivate.ptr = hwp;
> 
>     switch (pVia->Chipset) {
>-        case VIA_VM800:
>+        case VIA_P4M800PRO:
>             DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "using alternative PutBits/GetBits functions for I2C Bus 3\n"));
>             pI2CBus->I2CPutBits = ViaI2C3SimplePutBits;
>             pI2CBus->I2CGetBits = ViaI2C3SimpleGetBits;
>diff --git a/src/via_id.c b/src/via_id.c
>index 0090ad6..c4200b2 100644
>--- a/src/via_id.c
>+++ b/src/via_id.c
>@@ -1,5 +1,6 @@
> /*
>- * Copyright 2004-2005 The Unichrome Project  [unichrome.sf.net]
>+ * Copyright 2015 Kevin Brace
>+ * Copyright 2004-2015 The Unichrome Project  [unichrome.sf.net]
>  *
>  * Permission is hereby granted, free of charge, to any person obtaining a
>  * copy of this software and associated documentation files (the "Software"),
>@@ -36,7 +37,7 @@
>  * only a pointer to a single entry will ever be used outside.
>  */
> static struct ViaCardIdStruct ViaCardId[] = {
>-    /*** CLE266 ***/
>+    /* CLE266 */
>     {"ECS CLE266 (1.0)",                      VIA_CLE266,  0x1019, 0x1B43, VIA_DEVICE_CRT | VIA_DEVICE_TV},
>     {"LT21 VA28",                             VIA_CLE266,  0x1019, 0x1B44, VIA_DEVICE_CRT},
>     {"ECS G320",                              VIA_CLE266,  0x1019, 0xB320, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>@@ -46,7 +47,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
>     {"Clevo T200V",                           VIA_CLE266,  0x1558, 0x200A, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>     {"Biostar ARKplus III",                   VIA_CLE266,  0x1565, 0x3204, VIA_DEVICE_CRT | VIA_DEVICE_TV}, /* FS454 TV encoder */
> 
>-    /*** KM400, KM400A, KN400, P4M800 ***/
>+    /* KM400 / KM400A / KN400 / P4M800 */
>     {"ECS KM400-M2",                          VIA_KM400,   0x1019, 0x1842, VIA_DEVICE_CRT},
>     {"Acer Aspire 135x",                      VIA_KM400,   0x1025, 0x0033, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
>     {"Asustek A7V8X-MX",                      VIA_KM400,   0x1043, 0x80ED, VIA_DEVICE_CRT},
>@@ -80,7 +81,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
>     {"Mercury P4VM800M7 (1.0)",               VIA_KM400,   0x3344, 0x1122, VIA_DEVICE_CRT},
>     {"Soyo K7VME",                            VIA_KM400,   0xA723, 0x10FD, VIA_DEVICE_CRT},
> 
>-    /*** K8M800, K8N800, K8N800A ***/
>+    /* K8M800 / K8N800 */
>     {"ZX-5360",                               VIA_K8M800,  0x1019, 0x0F60, VIA_DEVICE_CRT | VIA_DEVICE_LCD },
>     {"ECS K8M800-M2 (1.0)",                   VIA_K8M800,  0x1019, 0x1828, VIA_DEVICE_CRT},
>     {"ECS K8M800-M2 (2.0)",                   VIA_K8M800,  0x1019, 0x1B45, VIA_DEVICE_CRT},
>@@ -120,7 +121,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
>     {"ASRock K8Upgrade-VM800",                VIA_K8M800,  0x1849, 0x3108, VIA_DEVICE_CRT},
>     {"Axper XP-M8VM800",                      VIA_K8M800,  0x1940, 0xD000, VIA_DEVICE_CRT},
> 
>-    /*** PM800, PM880, PN800, CN400 ***/
>+    /* PM800 / PN800 / PM880 / CN400 */
>     {"VIA VT3118 (PM800)",                    VIA_PM800,   0x1106, 0x3118, VIA_DEVICE_CRT}, /* borrowed by ECS PM800-M2 */
>     {"Hasee F700C",                           VIA_PM800,   0x1071, 0x8650, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>     {"Mitac 8666",                            VIA_PM800,   0x1071, 0x8666, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
>@@ -136,42 +137,66 @@ static struct ViaCardIdStruct ViaCardId[] = {
>     {"Chaintech MPM800-3",                    VIA_PM800,   0x270F, 0x7671, VIA_DEVICE_CRT},
>     {"KamLAB KINO-LUKE-533-R20",              VIA_PM800,   0x3344, 0x1122, VIA_DEVICE_CRT},
> 
>-    /*** P4M800Pro, VN800, CN700 ***/
>-    {"Clevo/RoverBook Partner E419L",         VIA_VM800,   0x1019, 0x0F75, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"Haier A60-440256080BD",                 VIA_VM800,   0x1019, 0x0F79, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"PCChips P23G",                          VIA_VM800,   0x1019, 0x1623, VIA_DEVICE_CRT},
>-    {"ECS P4M800PRO-M",                       VIA_VM800,   0x1019, 0x2122, VIA_DEVICE_CRT},
>-    {"ECS P4M800PRO-M2 (V2.0)",               VIA_VM800,   0x1019, 0x2123, VIA_DEVICE_CRT},
>-    {"ECS C7VCM",                             VIA_VM800,   0x1019, 0xAA2D, VIA_DEVICE_CRT},
>-    {"PCChips V21G",                          VIA_VM800,   0x1019, 0xAA51, VIA_DEVICE_CRT},
>-    {"Hewlett Packard DX2020",                VIA_VM800,   0x103C, 0x3027, VIA_DEVICE_CRT},
>-    {"Hitachi FLORA Se210 RK1",               VIA_VM800,   0x1043, 0x13E2, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"Asustek P5VDC-MX",                      VIA_VM800,   0x1043, 0x3344, VIA_DEVICE_CRT},
>-    {"Asustek P5VDC-TVM",                     VIA_VM800,   0x1043, 0x81CE, VIA_DEVICE_CRT},
>-    {"Foxconn P4M800P7MB-RS2H",               VIA_VM800,   0x105B, 0x0CF0, VIA_DEVICE_CRT},
>-    {"Gateway MX3210",                        VIA_VM800,   0x107B, 0x0216, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"VIA VT3344 (VM800) - EPIA EN",          VIA_VM800,   0x1106, 0x3344, VIA_DEVICE_CRT | VIA_DEVICE_TV},
>-    {"Gigabyte GA-8VM800M-775",               VIA_VM800,   0x1458, 0xD000, VIA_DEVICE_CRT},
>-    {"MSI PM8M-V",                            VIA_VM800,   0x1462, 0x7104, VIA_DEVICE_CRT},
>-    {"MSI Fuzzy CN700/CN700T/CN700G",         VIA_VM800,   0x1462, 0x7199, VIA_DEVICE_CRT | VIA_DEVICE_TV},
>-    {"MSI PM8M3-V",                           VIA_VM800,   0x1462, 0x7211, VIA_DEVICE_CRT},
>-    {"MSI PM8PM",                             VIA_VM800,   0x1462, 0x7222, VIA_DEVICE_CRT},
>-    {"Twinhead M6",                           VIA_VM800,   0x14FF, 0xA007, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"RoverBook Partner W500",                VIA_VM800,   0x1509, 0x4330, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"FIC PTM800Pro LF",                      VIA_VM800,   0x1509, 0x601A, VIA_DEVICE_CRT},
>-    {"Clevo/RoverBook Voyager V511L",         VIA_VM800,   0x1558, 0x0662, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"Clevo M5xxS",                           VIA_VM800,   0x1558, 0x5406, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"Biostar P4M80-M4 / P4VMA-M",            VIA_VM800,   0x1565, 0x1202, VIA_DEVICE_CRT},
>-    {"Biostar P4M800 Pro-M7",                 VIA_VM800,   0x1565, 0x1206, VIA_DEVICE_CRT},
>-    {"Packard Bell Lima (ASUS MBP5VDZ-NVM)",  VIA_VM800,   0x1631, 0xE018, VIA_DEVICE_CRT},
>-    {"Fujitsu/Siemens Amilo Pro V2030",       VIA_VM800,   0x1734, 0x109B, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"Fujitsu/Siemens Amilo Pro V2035",       VIA_VM800,   0x1734, 0x10AE, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"Fujitsu/Siemens Amilo Pro V2055",       VIA_VM800,   0x1734, 0x10CA, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"Fujitsu/Siemens Amilo L7320",           VIA_VM800,   0x1734, 0x10CD, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"ASRock P4VM800",                        VIA_VM800,   0x1849, 0x3344, VIA_DEVICE_CRT},
>-    {"Asustek P5V800-MX",                     VIA_VM800,   0x3344, 0x1122, VIA_DEVICE_CRT},
>+    /* P4M800 Pro / VN800 / CN700 */
>+    {"Clevo/RoverBook Partner E419L",         VIA_P4M800PRO,   0x1019, 0x0F75, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"Haier A60-440256080BD",                 VIA_P4M800PRO,   0x1019, 0x0F79, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"PCChips P23G",                          VIA_P4M800PRO,   0x1019, 0x1623, VIA_DEVICE_CRT},
>+    {"ECS P4M800PRO-M",                       VIA_P4M800PRO,   0x1019, 0x2122, VIA_DEVICE_CRT},
>+    {"ECS P4M800PRO-M2 (V2.0)",               VIA_P4M800PRO,   0x1019, 0x2123, VIA_DEVICE_CRT},
>+    {"ECS C7VCM",                             VIA_P4M800PRO,   0x1019, 0xAA2D, VIA_DEVICE_CRT},
>+    {"PCChips V21G",                          VIA_P4M800PRO,   0x1019, 0xAA51, VIA_DEVICE_CRT},
>+    {"Hewlett Packard DX2020",                VIA_P4M800PRO,   0x103C, 0x3027, VIA_DEVICE_CRT},
>+    {"Hitachi FLORA Se210 RK1",               VIA_P4M800PRO,   0x1043, 0x13E2, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"Asustek P5VDC-MX",                      VIA_P4M800PRO,   0x1043, 0x3344, VIA_DEVICE_CRT},
>+    {"Asustek P5VDC-TVM",                     VIA_P4M800PRO,   0x1043, 0x81CE, VIA_DEVICE_CRT},
>+    {"Foxconn P4M800P7MB-RS2H",               VIA_P4M800PRO,   0x105B, 0x0CF0, VIA_DEVICE_CRT},
>+    {"Gateway MX3210",                        VIA_P4M800PRO,   0x107B, 0x0216, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"VIA VT3344 (VM800) - EPIA EN",          VIA_P4M800PRO,   0x1106, 0x3344, VIA_DEVICE_CRT | VIA_DEVICE_TV},
>+    {"Gigabyte GA-8VM800M-775",               VIA_P4M800PRO,   0x1458, 0xD000, VIA_DEVICE_CRT},
>+    {"MSI PM8M-V",                            VIA_P4M800PRO,   0x1462, 0x7104, VIA_DEVICE_CRT},
>+    {"MSI Fuzzy CN700/CN700T/CN700G",         VIA_P4M800PRO,   0x1462, 0x7199, VIA_DEVICE_CRT | VIA_DEVICE_TV},
>+    {"MSI PM8M3-V",                           VIA_P4M800PRO,   0x1462, 0x7211, VIA_DEVICE_CRT},
>+    {"MSI PM8PM",                             VIA_P4M800PRO,   0x1462, 0x7222, VIA_DEVICE_CRT},
>+    {"Twinhead M6",                           VIA_P4M800PRO,   0x14FF, 0xA007, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"RoverBook Partner W500",                VIA_P4M800PRO,   0x1509, 0x4330, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"FIC PTM800Pro LF",                      VIA_P4M800PRO,   0x1509, 0x601A, VIA_DEVICE_CRT},
>+    {"Clevo/RoverBook Voyager V511L",         VIA_P4M800PRO,   0x1558, 0x0662, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"Clevo M5xxS",                           VIA_P4M800PRO,   0x1558, 0x5406, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"Biostar P4M80-M4 / P4VMA-M",            VIA_P4M800PRO,   0x1565, 0x1202, VIA_DEVICE_CRT},
>+    {"Biostar P4M800 Pro-M7",                 VIA_P4M800PRO,   0x1565, 0x1206, VIA_DEVICE_CRT},
>+    {"Packard Bell Lima (ASUS MBP5VDZ-NVM)",  VIA_P4M800PRO,   0x1631, 0xE018, VIA_DEVICE_CRT},
>+    {"Fujitsu/Siemens Amilo Pro V2030",       VIA_P4M800PRO,   0x1734, 0x109B, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"Fujitsu/Siemens Amilo Pro V2035",       VIA_P4M800PRO,   0x1734, 0x10AE, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"Fujitsu/Siemens Amilo Pro V2055",       VIA_P4M800PRO,   0x1734, 0x10CA, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"Fujitsu/Siemens Amilo L7320",           VIA_P4M800PRO,   0x1734, 0x10CD, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"ASRock P4VM800",                        VIA_P4M800PRO,   0x1849, 0x3344, VIA_DEVICE_CRT},
>+    {"Asustek P5V800-MX",                     VIA_P4M800PRO,   0x3344, 0x1122, VIA_DEVICE_CRT},
> 
>-    /*** K8M890 ***/
>+    /* CX700 / VX700 */
>+    {"VIA VT8454B",                           VIA_CX700,   0x0908, 0x1975, VIA_DEVICE_CRT}, /* Evaluation board, reference possibly wrong */
>+    {"VIA VT3324 (CX700)",                    VIA_CX700,   0x1106, 0x3157, VIA_DEVICE_CRT},
>+    {"MSI Fuzzy CX700/CX700D",                VIA_CX700,   0x1462, 0x8020, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
>+    {"Samsung Q1B",                           VIA_CX700,   0x144D, 0xC02C, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"FIC CE260",                             VIA_CX700,   0x1509, 0x2D30, VIA_DEVICE_LCD},
>+    {"FIC CE261",                             VIA_CX700,   0x1509, 0x2F07, VIA_DEVICE_LCD},
>+    {"Gigabyte M704 / RoverPC A700GQ",        VIA_CX700,   0x161F, 0x2060, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"Packard Bell EasyNote XS",              VIA_CX700,   0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */
>+
>+    /* P4M890 / CN800 */
>+    {"PCChips P29G",                          VIA_P4M890,  0x1019, 0x1629, VIA_DEVICE_CRT},
>+    {"ECS P4M890T-M v2.0",                    VIA_P4M890,  0x1019, 0x2171, VIA_DEVICE_CRT},
>+    {"PCChips ????",                          VIA_P4M890,  0x1019, 0x2174, VIA_DEVICE_CRT},
>+    {"Asustek P5V-VM ULTRA",                  VIA_P4M890,  0x1043, 0x81B5, VIA_DEVICE_CRT},
>+    {"Asustek P5V-VM DH",                     VIA_P4M890,  0x1043, 0x81CE, VIA_DEVICE_CRT},
>+    {"Mitac 8615",                            VIA_P4M890,  0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"Mitac 8624 (Joybook R41E)",             VIA_P4M890,  0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>+    {"VIA VT3343 (P4M890)",                   VIA_P4M890,  0x1106, 0x3343, VIA_DEVICE_CRT},
>+    {"MSI P4M890M-L/IL (MS-7255)",            VIA_P4M890,  0x1462, 0x7255, VIA_DEVICE_CRT},
>+    {"Abit IP-95",                            VIA_P4M890,  0x147B, 0x1422, VIA_DEVICE_CRT},
>+    {"Biostar P4M890-M7 TE",                  VIA_P4M890,  0x1565, 0x1207, VIA_DEVICE_CRT},
>+    {"ASRock P4VM890",                        VIA_P4M890,  0x1849, 0x3343, VIA_DEVICE_CRT},
>+
>+    /* K8M890 / K8N890 */
>     {"IBM AnyPlace Kiosk 3xx",                VIA_K8M890,  0x1106, 0x3230, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>     {"Asustek A8V-VM",                        VIA_K8M890,  0x1043, 0x81B5, VIA_DEVICE_CRT},
>     {"Asustek M2V-MX SE",                     VIA_K8M890,  0x1043, 0x8297, VIA_DEVICE_CRT},
>@@ -183,7 +208,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
>     {"Fujitsu/Siemens Amilo La 1703",         VIA_K8M890,  0x1734, 0x10D9, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>     {"Lenovo M3120C",                         VIA_K8M890,  0x17AA, 0x3020, VIA_DEVICE_CRT},
> 
>-    /*** P4M900, VN896, CN896 ***/
>+    /* P4M900 / VN896 / CN896 */
>     {"VIA Epia SN",                           VIA_P4M900,  0x0908, 0x1975, VIA_DEVICE_CRT},
>     {"Hewlett Packard 2133 Mini-Note",        VIA_P4M900,  0x103C, 0x3030, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>     {"Hewlett Packard Compaq dx2040",         VIA_P4M900,  0x103C, 0x3633, VIA_DEVICE_CRT},
>@@ -213,31 +238,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
>     {"Fujitsu/Siemens Amilo Li1705",          VIA_P4M900,  0x1734, 0x10F7, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>     {"ASRock P4VM900-SATA2",                  VIA_P4M900,  0x1849, 0x3371, VIA_DEVICE_CRT},
> 
>-    /*** CX700 ***/
>-    {"VIA VT8454B",                           VIA_CX700,   0x0908, 0x1975, VIA_DEVICE_CRT}, /* Evaluation board, reference possibly wrong */
>-    {"VIA VT3324 (CX700)",                    VIA_CX700,   0x1106, 0x3157, VIA_DEVICE_CRT},
>-    {"MSI Fuzzy CX700/CX700D",                VIA_CX700,   0x1462, 0x8020, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
>-    {"Samsung Q1B",                           VIA_CX700,   0x144D, 0xC02C, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"FIC CE260",                             VIA_CX700,   0x1509, 0x2D30, VIA_DEVICE_LCD},
>-    {"FIC CE261",                             VIA_CX700,   0x1509, 0x2F07, VIA_DEVICE_LCD},
>-    {"Gigabyte M704 / RoverPC A700GQ",        VIA_CX700,   0x161F, 0x2060, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"Packard Bell EasyNote XS",              VIA_CX700,   0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */
>-
>-    /*** P4M890, VN890 ***/
>-    {"PCChips P29G",                          VIA_P4M890,  0x1019, 0x1629, VIA_DEVICE_CRT},
>-    {"ECS P4M890T-M v2.0",                    VIA_P4M890,  0x1019, 0x2171, VIA_DEVICE_CRT},
>-    {"PCChips ????",                          VIA_P4M890,  0x1019, 0x2174, VIA_DEVICE_CRT},
>-    {"Asustek P5V-VM ULTRA",                  VIA_P4M890,  0x1043, 0x81B5, VIA_DEVICE_CRT},
>-    {"Asustek P5V-VM DH",                     VIA_P4M890,  0x1043, 0x81CE, VIA_DEVICE_CRT},
>-    {"Mitac 8615",                            VIA_P4M890,  0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"Mitac 8624 (Joybook R41E)",             VIA_P4M890,  0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>-    {"VIA VT3343 (P4M890)",                   VIA_P4M890,  0x1106, 0x3343, VIA_DEVICE_CRT},
>-    {"MSI P4M890M-L/IL (MS-7255)",            VIA_P4M890,  0x1462, 0x7255, VIA_DEVICE_CRT},
>-    {"Abit IP-95",                            VIA_P4M890,  0x147B, 0x1422, VIA_DEVICE_CRT},
>-    {"Biostar P4M890-M7 TE",                  VIA_P4M890,  0x1565, 0x1207, VIA_DEVICE_CRT},
>-    {"ASRock P4VM890",                        VIA_P4M890,  0x1849, 0x3343, VIA_DEVICE_CRT},
>-
>-    /*** VX800 ***/
>+    /* VX800 / VX820 */
>     {"VIA Epia M700",                         VIA_VX800,   0x1106, 0x1122, VIA_DEVICE_CRT},
>     {"Siragon ML-6200",                       VIA_VX800,   0x1106, 0x2211, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>     {"Guillemot-Hercules ECafe EC900B",       VIA_VX800,   0x1106, 0x3349, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>@@ -250,12 +251,12 @@ static struct ViaCardIdStruct ViaCardId[] = {
>     {"Lenovo S12",                            VIA_VX800,   0x17aa, 0x388c, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
>     {"Fujitsu Futro S100",                    VIA_VX800,   0xA0A0, 0x0702, VIA_DEVICE_CRT},
> 
>-    /*** VX855 ***/
>+    /* VX855 / VX875 */
>     {"Dell Optiplex FX130",                   VIA_VX855,   0x1028, 0x0509, VIA_DEVICE_CRT},
>     {"VIA VT8562C",                           VIA_VX855,   0x1106, 0x5122, VIA_DEVICE_CRT},
>     {"OLPC XO 1.5",                           VIA_VX855,   0x152D, 0x0833, VIA_DEVICE_LCD},
> 
>-    /*** VX900 ***/
>+    /* VX900 */
>     {"Simmtronics SIMM-PC VX900i",            VIA_VX900,   0x1019, 0x3126, VIA_DEVICE_CRT},
>     {"ECS VX900-I",                           VIA_VX900,   0x1019, 0x7C8E, VIA_DEVICE_CRT},
>     {"Foxconn L740",                          VIA_VX900,   0x105B, 0x0CFD, VIA_DEVICE_LCD | VIA_DEVICE_CRT},
>diff --git a/src/via_outputs.c b/src/via_outputs.c
>index 66c9be1..0946f7f 100644
>--- a/src/via_outputs.c
>+++ b/src/via_outputs.c
>@@ -1,4 +1,5 @@
> /*
>+ * Copyright 2015 Kevin Brace
>  * Copyright 2005-2015 The Openchrome Project
>  *                     [http://www.freedesktop.org/wiki/Openchrome]
>  * Copyright 2004-2005 The Unichrome Project  [unichrome.sf.net]
>@@ -1081,7 +1082,7 @@ ViaOutputsDetect(ScrnInfoPtr pScrn)
>     if ((pVia->Chipset != VIA_P4M900) || (pVia->ActiveDevice & VIA_DEVICE_TV))
>         via_tv_init(pScrn);
> 
>-    if (pVia->Chipset == VIA_VM800) {
>+    if (pVia->Chipset == VIA_P4M800PRO) {
>         via_dvi_init(pScrn);
>     }
> 
>@@ -1529,7 +1530,7 @@ ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
>         case VIA_KM400:
>         case VIA_K8M800:
>         case VIA_PM800:
>-        case VIA_VM800:
>+        case VIA_P4M800PRO:
>             ViaSeqMask(hwp, 0x1A, 0x06, 0x06);
>             break;
>         default:
>diff --git a/src/via_regs.h b/src/via_regs.h
>index 1f43d6e..a7b0c25 100644
>--- a/src/via_regs.h
>+++ b/src/via_regs.h
>@@ -1,4 +1,5 @@
> /*
>+ * Copyright 2015 Kevin Brace
>  * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
>  * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
>  *
>@@ -22,13 +23,6 @@
>  * DEALINGS IN THE SOFTWARE.
>  */
> 
>-/*************************************************************************
>- *
>- *  File:       via_regs.c
>- *  Content:    The defines of Via registers
>- *
>- ************************************************************************/
>-
> #ifndef _VIA_REGS_H_
> #define _VIA_REGS_H_ 1
> 
>@@ -47,7 +41,6 @@ enum VIACHIPTAGS {
>     VIA_KM400,
>     VIA_K8M800,
>     VIA_PM800,
>-    VIA_VM800,
>     VIA_P4M800PRO,  /* VT3314 */
>     VIA_CX700,      /* VT3324 */
>     VIA_K8M890,     /* VT3336 */
>@@ -66,16 +59,16 @@ enum VIACHIPTAGS {
> #define PCI_VIA_VENDOR_ID       0x1106
> 
> #define PCI_CHIP_CLE3122        0x3122	/* CLE266 */
>-#define PCI_CHIP_VT3205         0x7205	/* KM400 */
>-#define PCI_CHIP_VT3204         0x3108	/* K8M800 */
>-#define PCI_CHIP_VT3259         0x3118	/* PM800 */
>-#define PCI_CHIP_VT3314         0x3344	/* VM800 */
>-#define PCI_CHIP_VT3324         0x3157	/* CX700 */
>-#define PCI_CHIP_VT3336         0x3230	/* K8M890 */
>-#define PCI_CHIP_VT3327         0x3343	/* P4M890 */
>-#define PCI_CHIP_VT3364         0x3371	/* P4M900 */
>-#define PCI_CHIP_VT3353         0x1122	/* VX800 */
>-#define PCI_CHIP_VT3409         0x5122	/* VX855/VX875 */
>+#define PCI_CHIP_VT3205         0x7205	/* KM400 / KM400A / KN400 / P4M800 */
>+#define PCI_CHIP_VT3204         0x3108	/* K8M800 / K8N800 */
>+#define PCI_CHIP_VT3259         0x3118	/* PM800 / PN800 / PM880 / CN400 */
>+#define PCI_CHIP_VT3314         0x3344	/* P4M800 Pro / VN800 / CN700 */
>+#define PCI_CHIP_VT3324         0x3157	/* CX700 / VX700 */
>+#define PCI_CHIP_VT3327         0x3343	/* P4M890 / CN800 */
>+#define PCI_CHIP_VT3336         0x3230	/* K8M890 / K8N890 */
>+#define PCI_CHIP_VT3364         0x3371	/* P4M900 / VN896 / CN896 */
>+#define PCI_CHIP_VT3353         0x1122	/* VX800 / VX820 */
>+#define PCI_CHIP_VT3409         0x5122	/* VX855 / VX875 */
> #define PCI_CHIP_VT3410         0x7122	/* VX900 */
> #ifdef VIA_VT3293_SUPPORT
> #define PCI_CHIP_VT3293         0x3225	/* CN750 */
>diff --git a/src/via_ums.c b/src/via_ums.c
>index cda0e45..addb3db 100644
>--- a/src/via_ums.c
>+++ b/src/via_ums.c
>@@ -1,4 +1,5 @@
> /*
>+ * Copyright 2015 Kevin Brace
>  * Copyright 2011-2015 The Openchrome Project
>  *                     [http://www.freedesktop.org/wiki/Openchrome]
>  *
>@@ -726,7 +727,7 @@ UMSPreInit(ScrnInfoPtr pScrn)
>             pScrn->videoRam = (1 << ((videoRam & 0x70) >> 4)) << 10;
>             break;
>         case VIA_PM800:
>-        case VIA_VM800:
>+        case VIA_P4M800PRO:
>         case VIA_K8M800:
> #ifdef HAVE_PCIACCESS
>             pci_device_cfg_read_u8(vgaDevice, &videoRam, 0xA1);
>diff --git a/src/via_xv.c b/src/via_xv.c
>index 6eafb68..ed2617c 100644
>--- a/src/via_xv.c
>+++ b/src/via_xv.c
>@@ -1,4 +1,5 @@
> /*
>+ * Copyright 2015 Kevin Brace
>  * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
>  * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
>  *
>@@ -610,7 +611,7 @@ viaInitVideo(ScreenPtr pScreen)
>         (pVia->Chipset == VIA_KM400) ||
>         (pVia->Chipset == VIA_K8M800) ||
>         (pVia->Chipset == VIA_PM800) ||
>-        (pVia->Chipset == VIA_VM800) ||
>+        (pVia->Chipset == VIA_P4M800PRO) ||
>         (pVia->Chipset == VIA_K8M890) ||
>         (pVia->Chipset == VIA_P4M900) ||
>         (pVia->Chipset == VIA_CX700) ||
>@@ -633,7 +634,7 @@ viaInitVideo(ScreenPtr pScreen)
> 
>     if ((pVia->Chipset == VIA_CLE266) || (pVia->Chipset == VIA_KM400) ||
>         (pVia->Chipset == VIA_K8M800) || (pVia->Chipset == VIA_PM800) ||
>-        (pVia->Chipset == VIA_VM800) || (pVia->Chipset == VIA_K8M890) ||
>+        (pVia->Chipset == VIA_P4M800PRO) || (pVia->Chipset == VIA_K8M890) ||
>         (pVia->Chipset == VIA_P4M900) || (pVia->Chipset == VIA_CX700) ||
>         (pVia->Chipset == VIA_P4M890) || (pVia->Chipset == VIA_VX800) ||
>         (pVia->Chipset == VIA_VX855 || (pVia->Chipset == VIA_VX900))) {
>diff --git a/src/via_xv_overlay.c b/src/via_xv_overlay.c
>index 85b2403..b65a688 100644
>--- a/src/via_xv_overlay.c
>+++ b/src/via_xv_overlay.c
>@@ -275,7 +275,7 @@ VIAVidHWDiffInit(ScrnInfoPtr pScrn)
>             HWDiff->dwNewScaleCtl = VID_HWDIFF_FALSE;
>             HWDiff->HQVCmeRegs = hqv_cme_regs;
>             break;
>-        case VIA_VM800:
>+        case VIA_P4M800PRO:
>         case VIA_P4M900:
>             HWDiff->dwThreeHQVBuffer = VID_HWDIFF_TRUE;
>             HWDiff->dwHQVFetchByteUnit = VID_HWDIFF_TRUE;
>@@ -1857,7 +1857,7 @@ Upd_Video(xf86CrtcPtr crtc, unsigned long videoFlag,
>      * Enable video on secondary
>      */
>     if ((pVia->VideoEngine == VIDEO_ENGINE_CME ||
>-         pVia->Chipset == VIA_VM800) && iga->index) {
>+         pVia->Chipset == VIA_P4M800PRO) && iga->index) {
>         /* V1_ON_SND_DISPLAY */
>         vidCtl |= V1_ON_SND_DISPLAY;
>         /* SECOND_DISPLAY_COLOR_KEY_ENABLE */

Actions: View | Splinter Review

Attachments on bug 92861: 119473 | 119668 | 120321 | 120804 | 120805 | 120808 | 120851

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.