xserver-xorg-video-openchrome: Changes to 'upstream-unstable'
src/via_driver.c | 3 +++
src/via_id.c | 4 +++-
src/via_swov.c | 4 +---
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
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 */
Reply to: