xserver-xorg-video-openchrome: Changes to 'upstream-experimental'
NEWS | 12 ++++++------
configure.ac | 2 +-
src/Makefile.am | 10 +++++-----
src/via_driver.c | 19 +++++++++++++------
src/via_driver.h | 2 +-
src/via_id.c | 17 +++++++++++++++--
src/via_swov.c | 3 ++-
7 files changed, 43 insertions(+), 22 deletions(-)
New commits:
commit aceecbbc920016208c3168b35b5ce8c427dfa5cd
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Mon Jul 14 20:33:32 2008 +0000
ECS CLE266 (reported by Mohammed Abd El Hameed)
git-svn-id: http://svn.openchrome.org/svn/trunk@581 e8d65cb0-85f4-0310-8831-c60e2a5ce829
(cherry picked from commit 0e4b70c57b375cf7414052366226febeaf81cd5f)
diff --git a/src/via_id.c b/src/via_id.c
index fafe724..a231385 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -39,6 +39,7 @@
*/
static struct ViaCardIdStruct ViaCardId[] = {
/*** 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},
{"Asustek Terminator C3V", VIA_CLE266, 0x1043, 0x8155, VIA_DEVICE_CRT},
commit 64833f585bf13eb5dd42cc085de27af94e13c338
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Wed Aug 20 20:44:27 2008 +0000
Gigabyte M704 / RoverPC A700GQ
git-svn-id: http://svn.openchrome.org/svn/trunk@589 e8d65cb0-85f4-0310-8831-c60e2a5ce829
(cherry picked from commit adbe20d5b3029f9b5d8f13666e66010d80e077d7)
diff --git a/src/via_id.c b/src/via_id.c
index 99ca16f..fafe724 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -195,6 +195,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"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 ***/
commit da3980bd941c882328161bbccf2073a12eb06a53
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Tue Aug 12 13:14:18 2008 +0000
MSI K9MM-V
git-svn-id: http://svn.openchrome.org/svn/trunk@586 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index 3d378b7..99ca16f 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -94,6 +94,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"MSI K8M Neo-V", VIA_K8M800, 0x1462, 0x0320, VIA_DEVICE_CRT},
{"MSI K8MM-V", VIA_K8M800, 0x1462, 0x7142, VIA_DEVICE_CRT},
{"MSI K8MM3-V", VIA_K8M800, 0x1462, 0x7181, VIA_DEVICE_CRT},
+ {"MSI K9MM-V", VIA_K8M800, 0x1462, 0x7312, VIA_DEVICE_CRT},
{"MSI K8MM-ILSR", VIA_K8M800, 0x1462, 0x7410, VIA_DEVICE_CRT},
{"Abit KV-80", VIA_K8M800, 0x147B, 0x1419, VIA_DEVICE_CRT},
{"Abit KV-81", VIA_K8M800, 0x147B, 0x141A, VIA_DEVICE_CRT},
commit 5bdedaff47ac416b2a970b270e03abe8c193a0cb
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Wed Jul 23 14:23:49 2008 +0000
Foxconn P4M9007MB-8RS2H (reported by Stephen Yu)
git-svn-id: http://svn.openchrome.org/svn/trunk@583 e8d65cb0-85f4-0310-8831-c60e2a5ce829
(cherry picked from commit fa8d2e2fc566d7921a31c3ab4d653a31162ecc82)
diff --git a/src/via_id.c b/src/via_id.c
index cc81923..3d378b7 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -169,6 +169,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"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},
+ {"Foxconn P4M9007MB-8RS2H", VIA_P4M900, 0x105B, 0x0C87, VIA_DEVICE_CRT},
{"Mitac 8515", VIA_P4M900, 0x1071, 0x8515, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Medion Notebook MD96483", VIA_P4M900, 0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Mitac 8624", VIA_P4M900, 0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
commit 042283ff97a1365cfede82c262859dc436cab719
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Mon Jul 7 19:21:30 2008 +0000
MSI VR321 (reported by Kot Cheshirsky)
git-svn-id: http://svn.openchrome.org/svn/trunk@580 e8d65cb0-85f4-0310-8831-c60e2a5ce829
(cherry picked from commit e50f06a219452ebc12b12c6bc6a4e39454eb9c2a)
diff --git a/src/via_id.c b/src/via_id.c
index 6f7a0f9..cc81923 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -174,6 +174,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Mitac 8624", VIA_P4M900, 0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"VIA VT3364 (P4M900)", VIA_P4M900, 0x1106, 0x3371, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Gigabyte GA-VM900M", VIA_P4M900, 0x1458, 0xD000, VIA_DEVICE_CRT},
+ {"MSI VR321", VIA_P4M900, 0x1462, 0x3355, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"MSI P4M900M / P4M900M2-F/L", VIA_P4M900, 0x1462, 0x7255, VIA_DEVICE_CRT},
{"Everex NC1501/NC1503", VIA_P4M900, 0x1509, 0x1E30, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Clevo M660SE", VIA_P4M900, 0x1558, 0x0664, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
commit 6a550146a28b5b4c907531059a61fc73d6cbaca6
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Mon Jun 30 22:33:04 2008 +0000
fix interpolation for CN400
git-svn-id: http://svn.openchrome.org/svn/trunk@579 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index 0287e78..a937edf 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -823,6 +823,9 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
pVia->agpEnable = FALSE;
pVia->DRIIrqEnable = FALSE;
break;
+ case VIA_PM800:
+ pVia->VideoEngine = VIDEO_ENGINE_CME;
+ break;
case VIA_VM800:
pVia->agpEnable = FALSE;
break;
@@ -839,7 +842,6 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
pVia->dmaXV = FALSE;
break;
case VIA_CX700:
- case VIA_PM800:
pVia->VideoEngine = VIDEO_ENGINE_CME;
pVia->swov.maxWInterp = 1920;
pVia->swov.maxHInterp = 1080;
commit 2d40b7d9b65a8a32fbd6bd8ee38ef6698b3bd7ab
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Thu Jun 26 21:55:46 2008 +0000
re-enable XV on panel for VM800
git-svn-id: http://svn.openchrome.org/svn/trunk@578 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_swov.c b/src/via_swov.c
index 2a13419..e85d0ba 100644
--- a/src/via_swov.c
+++ b/src/via_swov.c
@@ -1727,7 +1727,8 @@ Upd_Video(ScrnInfoPtr pScrn, unsigned long videoFlag,
* FIXME:
* Enable video on secondary
*/
- if (pVia->VideoEngine == VIDEO_ENGINE_CME
+ if ((pVia->VideoEngine == VIDEO_ENGINE_CME
+ || pVia->Chipset == VIA_VM800)
&& pVia->pBIOSInfo->PanelActive) {
/* V1_ON_SND_DISPLAY */
vidCtl |= 0x80000000;
commit da2e50a6485667c0d2c5fc1b2b15610523c705ef
Author: ben <ben@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sun Jun 15 22:17:42 2008 +0000
VM800/CN700 appears to have a CLE video engine (reported by Vincent Magnin).
git-svn-id: http://svn.openchrome.org/svn/trunk@577 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index e51ed8e..0287e78 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -824,7 +824,6 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
pVia->DRIIrqEnable = FALSE;
break;
case VIA_VM800:
- pVia->VideoEngine = VIDEO_ENGINE_CME;
pVia->agpEnable = FALSE;
break;
case VIA_K8M890:
commit 48a5888fcb96eb619891de62f101181c81299b52
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Fri Jun 13 19:31:32 2008 +0000
fix typo
git-svn-id: http://svn.openchrome.org/svn/trunk@576 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_swov.c b/src/via_swov.c
index 1806c0e..2a13419 100644
--- a/src/via_swov.c
+++ b/src/via_swov.c
@@ -1727,7 +1727,7 @@ Upd_Video(ScrnInfoPtr pScrn, unsigned long videoFlag,
* FIXME:
* Enable video on secondary
*/
- if (pVia->VideoEngine == VIDEO_ENGINE_CME;
+ if (pVia->VideoEngine == VIDEO_ENGINE_CME
&& pVia->pBIOSInfo->PanelActive) {
/* V1_ON_SND_DISPLAY */
vidCtl |= 0x80000000;
commit cfe34353c4ad43c8b220da322349e682df973375
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Tue Jun 10 21:48:13 2008 +0000
put an end to the Xv on panel issues
git-svn-id: http://svn.openchrome.org/svn/trunk@575 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index 0287e78..e51ed8e 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -824,6 +824,7 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
pVia->DRIIrqEnable = FALSE;
break;
case VIA_VM800:
+ pVia->VideoEngine = VIDEO_ENGINE_CME;
pVia->agpEnable = FALSE;
break;
case VIA_K8M890:
diff --git a/src/via_swov.c b/src/via_swov.c
index 534baa2..1806c0e 100644
--- a/src/via_swov.c
+++ b/src/via_swov.c
@@ -1727,10 +1727,7 @@ Upd_Video(ScrnInfoPtr pScrn, unsigned long videoFlag,
* FIXME:
* Enable video on secondary
*/
- if ((pVia->Chipset == VIA_P4M900 ||
- pVia->Chipset == VIA_K8M890 ||
- pVia->Chipset == VIA_VM800 ||
- pVia->Chipset == VIA_CX700)
+ if (pVia->VideoEngine == VIDEO_ENGINE_CME;
&& pVia->pBIOSInfo->PanelActive) {
/* V1_ON_SND_DISPLAY */
vidCtl |= 0x80000000;
commit efee5e4e521dbe38fbc94c50fab9aacf385f6ab9
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Mon Jun 9 20:03:14 2008 +0000
fix Xv on LCD for K8M890
git-svn-id: http://svn.openchrome.org/svn/trunk@574 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_swov.c b/src/via_swov.c
index 2a2b47a..534baa2 100644
--- a/src/via_swov.c
+++ b/src/via_swov.c
@@ -1728,6 +1728,7 @@ Upd_Video(ScrnInfoPtr pScrn, unsigned long videoFlag,
* Enable video on secondary
*/
if ((pVia->Chipset == VIA_P4M900 ||
+ pVia->Chipset == VIA_K8M890 ||
pVia->Chipset == VIA_VM800 ||
pVia->Chipset == VIA_CX700)
&& pVia->pBIOSInfo->PanelActive) {
commit 1f77ab060b83c456bdf9f4c5b3d57d53a503fc2e
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sat Jun 7 16:54:02 2008 +0000
Samsung Q1B (reported by Massimo Vighetti)
git-svn-id: http://svn.openchrome.org/svn/trunk@573 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index 30a1733..6f7a0f9 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -189,6 +189,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"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},
{"Packard Bell EasyNote XS", VIA_CX700, 0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */
commit a7f7a6fbede663aba2f55445f11656f4ef2c89e8
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sat May 31 15:00:58 2008 +0000
Disable XvDMA for P4M890 and K8M890, it is broken...
git-svn-id: http://svn.openchrome.org/svn/trunk@572 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index 26f85da..0287e78 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -829,6 +829,7 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
case VIA_K8M890:
pVia->VideoEngine = VIDEO_ENGINE_CME;
pVia->agpEnable = FALSE;
+ pVia->dmaXV = FALSE;
break;
case VIA_P4M900:
pVia->VideoEngine = VIDEO_ENGINE_CME;
@@ -845,6 +846,7 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
break;
case VIA_P4M890:
pVia->VideoEngine = VIDEO_ENGINE_CME;
+ pVia->dmaXV = FALSE;
break;
}
commit 68554963cf26c4734dcdd2a89a844f9287638d74
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sat May 31 12:17:01 2008 +0000
new pci id: Mercury P4VM800M7
git-svn-id: http://svn.openchrome.org/svn/trunk@571 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index 8c23bb9..30a1733 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -75,6 +75,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"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},
+ {"Mercury P4VM800M7 (1.0)", VIA_KM400, 0x3344, 0x1122, VIA_DEVICE_CRT},
{"Soyo K7VME", VIA_KM400, 0xA723, 0x10FD, VIA_DEVICE_CRT},
/*** K8M800, K8N800, K8N800A ***/
@@ -200,7 +201,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"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},
+ {"Biostar P4M890-M7 TE", VIA_P4M890, 0x1565, 0x1207, VIA_DEVICE_CRT},
{"ASRock P4VM890", VIA_P4M890, 0x1849, 0x3343, VIA_DEVICE_CRT},
/* keep this */
commit 0aa55a939fbc214dacd40c82bd39c252125c9a80
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sun May 25 21:50:28 2008 +0000
replace xf86strstr by the unwrapped version
git-svn-id: http://svn.openchrome.org/svn/trunk@570 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index 639c642..26f85da 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1338,13 +1338,13 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
/* ActiveDevice Option for device selection */
//pVia->ActiveDevice = 0x00;
if ((s = xf86GetOptValString(VIAOptions, OPTION_ACTIVEDEVICE))) {
- if (xf86strstr(s, "CRT"))
+ if (strstr(s, "CRT"))
pVia->ActiveDevice |= VIA_DEVICE_CRT;
- if (xf86strstr(s, "LCD"))
+ if (strstr(s, "LCD"))
pVia->ActiveDevice |= VIA_DEVICE_LCD;
- if (xf86strstr(s, "DFP")) /* just treat this the same as LCD */
+ if (strstr(s, "DFP")) /* just treat this the same as LCD */
pVia->ActiveDevice |= VIA_DEVICE_LCD;
- if (xf86strstr(s, "TV"))
+ if (strstr(s, "TV"))
pVia->ActiveDevice |= VIA_DEVICE_TV;
}
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 ***/
commit 3829f5c3c4147751c2ddd622df41ebb1c2c6930d
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sat Apr 12 12:30:34 2008 +0000
fix chipset revision detection in libpciaccess code path
git-svn-id: http://svn.openchrome.org/svn/trunk@566 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index 79b833d..639c642 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1065,7 +1065,7 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
#ifdef XSERVER_LIBPCIACCESS
struct pci_device *bridge = via_host_bridge();
- pci_device_cfg_read_u32(bridge, &pVia->ChipRev, 0xF6);
+ pci_device_cfg_read_u8(bridge, &pVia->ChipRev, 0xF6);
#else
pVia->ChipRev = pciReadByte(pciTag(0, 0, 0), 0xF6);
#endif
commit 00821802af1adb0430eaf8be1535ef0c7a69e76b
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Wed Apr 9 22:44:29 2008 +0000
print driver version in the libpciaccess path
git-svn-id: http://svn.openchrome.org/svn/trunk@565 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index 5bd4371..79b833d 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -600,6 +600,9 @@ via_pci_probe(DriverPtr driver, int entity_num,
"VIA Technologies does not support this driver in any way.\n");
xf86Msg(X_NOTICE,
"For support, please refer to http://www.openchrome.org/.\n";);
+#ifdef BUILDCOMMENT
+ xf86Msg(X_NOTICE, BUILDCOMMENT"\n");
+#endif
}
return scrn != NULL;
}
commit e7aca5562b2be2801701e06236fc1a74df11b0b0
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Tue Apr 8 21:36:31 2008 +0000
hopefully fix svnversion.h once and for all...
git-svn-id: http://svn.openchrome.org/svn/trunk@563 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e5d581..73dc9ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,7 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+BUILT_SOURCES = svnversion.h
EXTRA_DIST = svnversion.h
CONFIG_CLEAN_FILES= svnversion.h
AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
@@ -100,5 +101,6 @@ svnversion.h: $(openchrome_drv_la_SOURCES)
@echo "created $@"
dist-hook:
+ rm svnversion.h;
echo '#define BUILDCOMMENT "(openchrome '$(VERSION)' release)"' \
> svnversion.h
commit e06de5373d8d42dbe4d6324feb5d92ea5f0da5ff
Author: ben <ben@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sun Mar 30 22:34:54 2008 +0000
Overwriting svnversion.h for a release, instead of using a separate file.
git-svn-id: http://svn.openchrome.org/svn/trunk@562 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/Makefile.am b/src/Makefile.am
index 6423284..7e5d581 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,8 +24,8 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-EXTRA_DIST = svnversion.h svnrelease.h
-CONFIG_CLEAN_FILES= svnversion.h svnrelease.h
+EXTRA_DIST = svnversion.h
+CONFIG_CLEAN_FILES= svnversion.h
AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
openchrome_drv_la_LTLIBRARIES = openchrome_drv.la
openchrome_drv_la_LDFLAGS = -module -avoid-version
@@ -87,9 +87,7 @@ endif
via_driver.lo: svnversion.h
svnversion.h: $(openchrome_drv_la_SOURCES)
- @if [ -f svnrelease.h ]; then \
- echo '#include "svnrelease.h"' > $@.tmp; \
- elif [ -d .svn ]; then \
+ @if [ -d .svn ]; then \
echo '#define BUILDCOMMENT "(development build, at svn revision '\
"`svnversion -nc .. | sed -e s/^[^:]*://`"')"' > $@.tmp; \
else \
@@ -103,4 +101,4 @@ svnversion.h: $(openchrome_drv_la_SOURCES)
dist-hook:
echo '#define BUILDCOMMENT "(openchrome '$(VERSION)' release)"' \
- > svnrelease.h
+ > svnversion.h
commit 891e12adff17006a5e5baf0d5f0f7a46bbfe7618
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sat Mar 29 00:09:37 2008 +0000
include svnrelease.h in tarball
git-svn-id: http://svn.openchrome.org/svn/trunk@561 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/Makefile.am b/src/Makefile.am
index b1d18f3..6423284 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-EXTRA_DIST = svnversion.h
+EXTRA_DIST = svnversion.h svnrelease.h
CONFIG_CLEAN_FILES= svnversion.h svnrelease.h
AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
openchrome_drv_la_LTLIBRARIES = openchrome_drv.la
commit 2f50d6418b6570146da68248618f2cd6b9a8a044
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Fri Mar 28 23:59:08 2008 +0000
Bump version for release
git-svn-id: http://svn.openchrome.org/svn/trunk@560 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/NEWS b/NEWS
index b6455ac..77401ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-openchrome 0.2.902 (19/03/2008)
+openchrome 0.2.902 (29/03/2008)
-------------------------------
* Enhancements and bug fixes:
- libpciaccess support.
@@ -7,9 +7,9 @@ openchrome 0.2.902 (19/03/2008)
- Various code clean up.
* New boards:
-- ASRock P4VM900-SATA2, Asustek P5VD2-VM SE, Biostar P4M800 Pro-M7,
- Clevo M54xSR, Clevo M660SR, Medion Notebook MD96483, Mitac 8515,
- Mitac 8624, MSI Fuzzy CX700/CX700D, Packard Bell EasyNote XS
+- ASRock P4VM900-SATA2, Asustek M2V-MX SE, Asustek P5VD2-VM SE,
+ Biostar P4M800 Pro-M7, Clevo M54xSR, Clevo M660SR, Medion Notebook MD96483,
+ Mitac 8515, Mitac 8624, MSI Fuzzy CX700/CX700D, Packard Bell EasyNote XS
(aka Everex Cloudbook CE1200V), VIA Epia SN.
* Notes:
@@ -27,7 +27,7 @@ openchrome 0.2.902 (19/03/2008)
openchrome 0.2.901 (02/01/2008)
---------------------
+-------------------------------
* Enhancements :
- New pci ids : FIC CE260, Hasee F700C, MSI P4M900M / P4M900M2-F/L,
PCChips V21G, Biostar P4M900M-M7 SE.
@@ -44,5 +44,5 @@ openchrome 0.2.901 (02/01/2008)
- Various code cleanups.
openchrome 0.2.900 (20/10/2007)
---------------------
+-------------------------------
- First openchrome official release.
diff --git a/configure.ac b/configure.ac
index aece250..a44b1b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- 0.2.901,
+ 0.2.902,
[http://www.openchrome.org/trac/report/1],
xf86-video-openchrome)
diff --git a/src/via_driver.h b/src/via_driver.h
index 4761ddc..75f74df 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -102,7 +102,7 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 2
#ifdef USE_NEW_XVABI
-#define PATCHLEVEL 901
+#define PATCHLEVEL 902
#else
#define PATCHLEVEL 0
#endif
commit c2979886a76e7d45ac4145db3a01739e25c8b129
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Wed Mar 26 19:39:13 2008 +0000
Asustek M2V-MX SE
git-svn-id: http://svn.openchrome.org/svn/trunk@559 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index e267981..1bea72d 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -154,7 +154,8 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Asustek P5V800-MX", VIA_VM800, 0x3344, 0x1122, VIA_DEVICE_CRT},
/*** K8M890 ***/
- {"ASUS A8V-VM", VIA_K8M890, 0x1043, 0x81B5, VIA_DEVICE_CRT},
+ {"Asustek A8V-VM", VIA_K8M890, 0x1043, 0x81B5, VIA_DEVICE_CRT},
+ {"Asustek M2V-MX SE", VIA_K8M890, 0x1043, 0x8297, VIA_DEVICE_CRT},
{"Foxconn K8M890M2MA-RS2H", VIA_K8M890, 0x105B, 0x0C84, VIA_DEVICE_CRT},
{"Shuttle FX22V1", VIA_K8M890, 0x1297, 0x3080, VIA_DEVICE_CRT},
{"MSI K9VGM-V", VIA_K8M890, 0x1462, 0x7253, VIA_DEVICE_CRT},
Reply to: