xserver-xorg-video-openchrome: Changes to 'upstream-unstable'
src/via_id.c | 7 ++++++-
src/via_swov.c | 4 +++-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit ac6c4738f99bdd90b2e79ee76270c2385133bd84
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Fri May 23 19:07:03 2008 +0000
some new pci ids
git-svn-id: http://svn.openchrome.org/svn/trunk@569 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index 03f3321..8c23bb9 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -74,7 +74,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Packard Bell Quasar2 (MSI MS6786)", VIA_KM400, 0x1631, 0xD002, VIA_DEVICE_CRT},
{"Epox EP-8KMM3I", VIA_KM400, 0x1695, 0x9023, VIA_DEVICE_CRT},
{"ASRock Inc. K7VM2/3/4", VIA_KM400, 0x1849, 0x7205, VIA_DEVICE_CRT},
- {"ACorp KM400QP", VIA_KM400, 0x1915, 0x1100, VIA_DEVICE_CRT| VIA_DEVICE_TV},
+ {"ACorp KM400QP", VIA_KM400, 0x1915, 0x1100, VIA_DEVICE_CRT | VIA_DEVICE_TV},
{"Soyo K7VME", VIA_KM400, 0xA723, 0x10FD, VIA_DEVICE_CRT},
/*** K8M800, K8N800, K8N800A ***/
@@ -125,6 +125,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Fujitsu/Siemens Amilo L7310", VIA_PM800, 0x1734, 0x10AB, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"ASRock P4VM8", VIA_PM800, 0x1849, 0x3118, VIA_DEVICE_CRT},
{"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},
@@ -164,6 +165,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
/*** 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},
{"Asustek P5VD2-VM", VIA_P4M900, 0x1043, 0x81CE, VIA_DEVICE_CRT},
{"Asustek P5VD2-VM SE", VIA_P4M900, 0x1043, 0x8252, VIA_DEVICE_CRT},
{"Mitac 8515", VIA_P4M900, 0x1071, 0x8515, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
@@ -192,11 +194,13 @@ static struct ViaCardIdStruct ViaCardId[] = {
/*** P4M890, VN890 ***/
{"PCChips P29G", VIA_P4M890, 0x1019, 0x1629, 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},
{"VIA VT3343 (P4M890)", VIA_P4M890, 0x1106, 0x3343, VIA_DEVICE_CRT},
{"MSI P4M890M-L/IL (MS-7255)", VIA_P4M890, 0x1462, 0x7255, VIA_DEVICE_CRT},
+ {"Biostar P4M890-M7 FE/SE/TE", VIA_P4M890, 0x1565, 0x1207, VIA_DEVICE_CRT},
{"ASRock P4VM890", VIA_P4M890, 0x1849, 0x3343, VIA_DEVICE_CRT},
/* keep this */
commit bd0bf44fcc92b6540327f4d992bc62009f791c64
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Mon May 19 12:33:59 2008 +0000
Fix Xv on LCD for CX700
git-svn-id: http://svn.openchrome.org/svn/trunk@568 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_swov.c b/src/via_swov.c
index 249447a..2a2b47a 100644
--- a/src/via_swov.c
+++ b/src/via_swov.c
@@ -1727,7 +1727,9 @@ Upd_Video(ScrnInfoPtr pScrn, unsigned long videoFlag,
* FIXME:
* Enable video on secondary
*/
- if ((pVia->Chipset == VIA_P4M900 || pVia->Chipset == VIA_VM800)
+ if ((pVia->Chipset == VIA_P4M900 ||
+ pVia->Chipset == VIA_VM800 ||
+ pVia->Chipset == VIA_CX700)
&& pVia->pBIOSInfo->PanelActive) {
/* V1_ON_SND_DISPLAY */
vidCtl |= 0x80000000;
commit 5129f9a852a77bab3b1a5b6c5856cc98da1ae2fd
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sat May 10 18:54:04 2008 +0000
FIC CE261 (reported by Robert Henney)
git-svn-id: http://svn.openchrome.org/svn/trunk@567 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index 1bea72d..03f3321 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -187,6 +187,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"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},
{"FIC CE260", VIA_CX700, 0x1509, 0x2D30, VIA_DEVICE_LCD},
+ {"FIC CE261", VIA_CX700, 0x1509, 0x2F07, VIA_DEVICE_LCD},
{"Packard Bell EasyNote XS", VIA_CX700, 0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */
/*** P4M890, VN890 ***/
Reply to: