xserver-xorg-video-openchrome: Changes to 'upstream-unstable'
ChangeLog | 153 +++++++++++++++++++++++++
src/openchrome.man | 18 +--
src/via.h | 41 ++++++
src/via_accel.c | 90 +++++++++------
src/via_bandwidth.c | 51 +++++++-
src/via_bios.h | 9 +
src/via_crtc.c | 7 +
src/via_cursor.c | 13 +-
src/via_dga.c | 6 -
src/via_dri.c | 49 ++++----
src/via_driver.c | 201 +++++++++++++++++++++++----------
src/via_driver.h | 9 +
src/via_i2c.c | 15 ++
src/via_id.c | 11 +
src/via_id.h | 2
src/via_lvds.c | 2
src/via_memcpy.c | 10 -
src/via_mode.c | 27 +++-
src/via_mode.h | 5
src/via_panel.c | 27 ++--
src/via_swov.c | 308 +++++++++++++++++++++++++++++++++++-----------------
src/via_swov.h | 4
src/via_timing.h | 2
src/via_vbe.c | 4
src/via_video.c | 34 +++--
src/via_vt162x.c | 46 ++++---
src/via_xvmc.c | 47 ++++---
27 files changed, 864 insertions(+), 327 deletions(-)
New commits:
commit c25bb04420ea4035bc70b8c9c7079554cbd55c8b
Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sun Feb 20 11:43:03 2011 +0000
Add workaround for #177 ticket
git-svn-id: http://svn.openchrome.org/svn/trunk@916 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index 8c84635..62d8fb1 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1015,6 +1015,12 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
switch (pVia->Chipset) {
case VIA_CLE266:
+#ifdef XSERVER_LIBPCIACCESS
+ pci_device_cfg_read_u8(bridge, &videoRam, 0xE1);
+#else
+ videoRam = pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70;
+#endif
+ pScrn->videoRam = (1 << ((videoRam & 0x70) >> 4)) << 10;
case VIA_KM400:
#ifdef XSERVER_LIBPCIACCESS
pci_device_cfg_read_u8(bridge, &videoRam, 0xE1);
@@ -1022,6 +1028,12 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
videoRam = pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70;
#endif
pScrn->videoRam = (1 << ((videoRam & 0x70) >> 4)) << 10;
+ /* Workaround for #177 (VRAM probing fail on P4M800) */
+ if (pScrn->videoRam < 16384) {
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "Memory size detection failed: using 16 MB.\n");
+ pScrn->videoRam = 16 << 10;
+ }
break;
case VIA_PM800:
case VIA_VM800:
@@ -1072,12 +1084,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
if (from == X_PROBED) {
xf86DrvMsg(pScrn->scrnIndex, from,
"Probed amount of VideoRAM = %d kB\n", pScrn->videoRam);
-
- if (pScrn->videoRam < 16384) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- "Memory size detection failed: using 16 MB.\n");
- pScrn->videoRam = 16 << 10;
- }
}
if (!VIASetupDefaultOptions(pScrn)) {
commit 57321bdb71efe67bd22b69896968825457bf9ea4
Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sun Feb 20 11:25:17 2011 +0000
Fix #395 - revert ViaPanelGetSizeFromDDC renaming (thanks to julienvdg)
git-svn-id: http://svn.openchrome.org/svn/trunk@915 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_panel.c b/src/via_panel.c
index d9ad742..583e12f 100644
--- a/src/via_panel.c
+++ b/src/via_panel.c
@@ -307,11 +307,8 @@ ViaPanelPreInit(ScrnInfoPtr pScrn)
int width, height;
Bool ret;
- ret = ViaPanelGetSizeFromDDC(pScrn, &width, &height);
-/*
- if (!ret)
- ret = ViaPanelGetSizeFromDDCv2(pScrn, &width);
-*/
+ ret = ViaPanelGetSizeFromDDCv1(pScrn, &width, &height);
+
if (ret) {
panel->NativeModeIndex = ViaPanelLookUpModeIndex(width, height);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaPanelLookUpModeIndex, Width %d, Height %d, NativeModeIndex%d\n", width, height, panel->NativeModeIndex));
@@ -411,7 +408,7 @@ ViaPanelGetSizeFromEDID(ScrnInfoPtr pScrn, xf86MonPtr pMon,
}
Bool
-ViaPanelGetSizeFromDDC(ScrnInfoPtr pScrn, int *width, int *height)
+ViaPanelGetSizeFromDDCv1(ScrnInfoPtr pScrn, int *width, int *height)
{
VIAPtr pVia = VIAPTR(pScrn);
xf86MonPtr pMon;
commit e47aba4c1272d59150cec53cb195b92ed6fc34f6
Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sun Feb 20 11:20:01 2011 +0000
Add suport for Semp Informática Notebook IS 1462 (reported by Colin)
git-svn-id: http://svn.openchrome.org/svn/trunk@914 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index d7353d1..fce5006 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -204,6 +204,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Fujitsu/Siemens Amilo Pro V3515", VIA_P4M900, 0x1734, 0x10CB, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Fujitsu/Siemens Amilo Li1705", VIA_P4M900, 0x1734, 0x10F7, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"ASRock P4VM900-SATA2", VIA_P4M900, 0x1849, 0x3371, VIA_DEVICE_CRT},
+ {"Semp Informática Notebook IS 1462", VIA_P4M900, 0x1509, 0x1D41, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
/*** CX700 ***/
{"VIA VT8454B", VIA_CX700, 0x0908, 0x1975, VIA_DEVICE_CRT}, /* Evaluation board, reference possibly wrong */
commit a5eabab7e4e40a20008af1b0056a9afed3ba9a67
Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sun Feb 20 11:12:12 2011 +0000
Fix VIA VB8001 Mini-ITX Board (P4M900) support
git-svn-id: http://svn.openchrome.org/svn/trunk@913 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index 96c7355..d7353d1 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -188,7 +188,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"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},
- {"VIA VT3364 (P4M900)", VIA_P4M900, 0x1106, 0x3371, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+ {"VIA VB8001 Mini-ITX Board (P4M900)", VIA_P4M900, 0x1106, 0x3371, VIA_DEVICE_CRT},
{"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},
commit cbcb1c3b975fdd1bc06cc62f6670840775a4d5ae
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Thu Feb 17 10:44:51 2011 +0000
Lenovo ThinkCenter E51 8714 (reported by José Jorge)
git-svn-id: http://svn.openchrome.org/svn/trunk@912 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index 176aa15..96c7355 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -115,6 +115,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Packard Bell Easynote B3 800/B3340", VIA_K8M800, 0x1631, 0xC009, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Packard Bell Imedia 2097", VIA_K8M800, 0x1631, 0xD007, VIA_DEVICE_CRT},
{"Fujitsu-Siemens Amilo K7610", VIA_K8M800, 0x1734, 0x10B3, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+ {"Lenovo ThinkCenter E51 8714", VIA_K8M800, 0x17AA, 0x1008, VIA_DEVICE_CRT},
{"ASRock K8Upgrade-VM800", VIA_K8M800, 0x1849, 0x3108, VIA_DEVICE_CRT},
{"Axper XP-M8VM800", VIA_K8M800, 0x1940, 0xD000, VIA_DEVICE_CRT},
commit 9202f9937056e94c54da01b4cb16e363222c38fa
Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Tue Jan 25 21:56:01 2011 +0000
Fix OpenGL application crash on VX900 chipset
git-svn-id: http://svn.openchrome.org/svn/trunk@909 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_dri.c b/src/via_dri.c
index 9fd2884..9690327 100644
--- a/src/via_dri.c
+++ b/src/via_dri.c
@@ -594,6 +594,7 @@ VIADRIScreenInit(ScreenPtr pScreen)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
pDRIInfo->clientDriverName = "swrast";
break;
default:
commit d3faa1e60d3cc69dccd3e8b5c32d898b504c5ae6
Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sun Jan 23 21:03:13 2011 +0000
Fix hardware cursor for VX900
git-svn-id: http://svn.openchrome.org/svn/trunk@908 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/ChangeLog b/ChangeLog
index 194a41a..546cf09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-23 Bartosz Kosiorek <gang65@poczta.onet.pl>
+
+ Enable hardware cursor for VX900
+
+ * src/via_cursor.c: (viaHWCursorInit):
+ * src/via_mode.c: (ViaModeSet):
+
2010-12-16 Bartosz Kosiorek <gang65@poczta.onet.pl>
Merge vx900_branch - initial VX900 support
diff --git a/src/via_cursor.c b/src/via_cursor.c
index 518f6fa..18d49d5 100644
--- a/src/via_cursor.c
+++ b/src/via_cursor.c
@@ -72,13 +72,6 @@ viaHWCursorInit(ScreenPtr pScreen)
pVia->CursorMaxHeight = 32;
pVia->CursorSize = ((pVia->CursorMaxWidth * pVia->CursorMaxHeight) / 8) * 2;
break;
- case VIA_VX900:
- /* FIXME : ARGB cursor should work */
- pVia->CursorARGBSupported = FALSE;
- pVia->CursorMaxWidth = 64;
- pVia->CursorMaxHeight = 64;
- pVia->CursorSize = pVia->CursorMaxWidth * (pVia->CursorMaxHeight + 1) << 2;
- break;
default:
pVia->CursorARGBSupported = TRUE;
pVia->CursorMaxWidth = 64;
diff --git a/src/via_mode.c b/src/via_mode.c
index c307239..476f1f1 100644
--- a/src/via_mode.c
+++ b/src/via_mode.c
@@ -1747,9 +1747,10 @@ ViaModeSet(ScrnInfoPtr pScrn, DisplayModePtr mode)
if (pBIOSInfo->Panel->IsActive &&
((pVia->Chipset == VIA_VM800) ||
(pVia->Chipset == VIA_K8M800) ||
- (pVia->Chipset == VIA_VX900) ))
+ (pVia->Chipset == VIA_VX900) )) {
+ pBIOSInfo->FirstCRTC->IsActive=TRUE;
ViaModeFirstCRTC(pScrn, mode);
-
+ }
if (pBIOSInfo->Simultaneous->IsActive) {
ViaDisplayEnableSimultaneous(pScrn);
} else {
commit d795f35b79d2125e0d5b9324a5d0316632d7dd90
Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sat Jan 22 17:01:16 2011 +0000
Restore video interrupt flag
git-svn-id: http://svn.openchrome.org/svn/trunk@907 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_video.c b/src/via_video.c
index 6687e82..310f44b 100644
--- a/src/via_video.c
+++ b/src/via_video.c
@@ -519,6 +519,7 @@ viaRestoreVideo(ScrnInfoPtr pScrn)
viaVidEng->alphafb_addr = localVidEng->alphafb_addr;
viaVidEng->chroma_low = localVidEng->chroma_low;
viaVidEng->chroma_up = localVidEng->chroma_up;
+ viaVidEng->interruptflag = localVidEng->interruptflag;
if (pVia->ChipId != PCI_CHIP_VT3314)
{
commit 29408279379d8eb86930ba6a094b767954d8e7d3
Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Fri Jan 21 17:13:04 2011 +0000
Use DRICreatePCIBusID when available to create Bus ID string
git-svn-id: http://svn.openchrome.org/svn/trunk@906 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_dri.c b/src/via_dri.c
index 26d1a86..9fd2884 100644
--- a/src/via_dri.c
+++ b/src/via_dri.c
@@ -600,17 +600,21 @@ VIADRIScreenInit(ScreenPtr pScreen)
pDRIInfo->clientDriverName = VIAClientDriverName;
break;
}
- pDRIInfo->busIdString = malloc(64);
- sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
+ if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
+ pDRIInfo->busIdString = DRICreatePCIBusID(pVia->PciInfo);
+ } else {
+ pDRIInfo->busIdString = malloc(64);
+ sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
#ifdef XSERVER_LIBPCIACCESS
- ((pVia->PciInfo->domain << 8) | pVia->PciInfo->bus),
- pVia->PciInfo->dev, pVia->PciInfo->func
+ ((pVia->PciInfo->domain << 8) | pVia->PciInfo->bus),
+ pVia->PciInfo->dev, pVia->PciInfo->func
#else
- ((pciConfigPtr)pVia->PciInfo->thisCard)->busnum,
- ((pciConfigPtr)pVia->PciInfo->thisCard)->devnum,
- ((pciConfigPtr)pVia->PciInfo->thisCard)->funcnum
+ ((pciConfigPtr)pVia->PciInfo->thisCard)->busnum,
+ ((pciConfigPtr)pVia->PciInfo->thisCard)->devnum,
+ ((pciConfigPtr)pVia->PciInfo->thisCard)->funcnum
#endif
- );
+ );
+ }
pDRIInfo->ddxDriverMajorVersion = VIA_DRIDDX_VERSION_MAJOR;
pDRIInfo->ddxDriverMinorVersion = VIA_DRIDDX_VERSION_MINOR;
pDRIInfo->ddxDriverPatchVersion = VIA_DRIDDX_VERSION_PATCH;
commit 1be7ac9fe23b5ff028e037954252fb2bca368102
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Thu Jan 20 10:55:16 2011 +0000
MSI PM8M-V
git-svn-id: http://svn.openchrome.org/svn/trunk@905 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index 9185970..176aa15 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -63,6 +63,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Giga-byte 7VM400(A)M", VIA_KM400, 0x1458, 0xD000, VIA_DEVICE_CRT},
{"MSI KM4(A)M-V", VIA_KM400, 0x1462, 0x7061, VIA_DEVICE_CRT}, /* aka "DFI KM400-MLV" */
{"MSI PM8M2-V", VIA_KM400, 0x1462, 0x7071, VIA_DEVICE_CRT},
+ {"MSI PM8M-V", VIA_KM400, 0x1462, 0x7104, VIA_DEVICE_CRT},
{"MSI KM4(A)M-L", VIA_KM400, 0x1462, 0x7348, VIA_DEVICE_CRT},
{"Abit VA-10 (1)", VIA_KM400, 0x147B, 0x140B, VIA_DEVICE_CRT},
{"Abit VA-10 (2)", VIA_KM400, 0x147B, 0x140C, VIA_DEVICE_CRT},
commit ca1f48cf6a13adb480017280d18222c0444208be
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sun Jan 16 18:26:05 2011 +0000
FIC CE2A1
git-svn-id: http://svn.openchrome.org/svn/trunk@904 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index b5b9000..9185970 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -231,6 +231,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Guillemot-Hercules ECafe EC900B", VIA_VX800, 0x1106, 0x3349, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"VIA OpenBook", VIA_VX800, 0x1170, 0x0311, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, /* VIA OpenBook eNote VBE8910 */
{"Samsung NC20", VIA_VX800, 0x144d, 0xc04e, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+ {"FIC CE2A1", VIA_VX800, 0x1509, 0x3002, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Quanta DreamBook Light IL1", VIA_VX800, 0x152d, 0x0771, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Lenovo S12", VIA_VX800, 0x17aa, 0x388c, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Siragon ML-6200", VIA_VX800, 0x1106, 0x2211, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
commit 7a227aa51537a9db530f1fc1b4fd4233882b04ed
Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Sun Dec 19 19:57:11 2010 +0000
Fix type in VIASave
git-svn-id: http://svn.openchrome.org/svn/trunk@891 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_driver.c b/src/via_driver.c
index 28ef7bd..8c84635 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -2066,7 +2066,7 @@ VIASave(ScrnInfoPtr pScrn)
}
/* Save Preemptive Arbiter Control Register */
- Regs->SR4C = hwp->readSeq(hwp, 0x4D);
+ Regs->SR4D = hwp->readSeq(hwp, 0x4D);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Crtc...\n"));
Regs->CR13 = hwp->readCrtc(hwp, 0x13);
commit c407cf49736a165c90b0c92d5ed699f56111ab9e
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Thu Dec 16 22:31:28 2010 +0000
add VX900 to man page
git-svn-id: http://svn.openchrome.org/svn/trunk@890 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/openchrome.man b/src/openchrome.man
index 9822fac..e20b68e 100644
--- a/src/openchrome.man
+++ b/src/openchrome.man
@@ -22,7 +22,7 @@ The
.B openchrome
driver supports the following chipsets: CLE266, KM400/KN400/KM400A/P4M800,
CN400/PM800/PN800/PM880, K8M800, CN700/VM800/P4M800Pro, CX700, P4M890, K8M890,
-P4M900/VN896/CN896, VX800 and VX855.
+P4M900/VN896/CN896, VX800, VX855 and VX900.
The driver includes 2D acceleration and Xv video overlay extensions.
Flat panel, TV, and VGA outputs are supported, depending on the hardware
configuration.
commit 3a9f041425766d005b395b47e3a98a102eb5dab1
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Thu Dec 16 22:26:34 2010 +0000
fix a typo and add a FIXME following the VX900 merge
git-svn-id: http://svn.openchrome.org/svn/trunk@889 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_accel.c b/src/via_accel.c
index 60f307d..c6252c2 100644
--- a/src/via_accel.c
+++ b/src/via_accel.c
@@ -1252,7 +1252,7 @@ viaInitXAA(ScreenPtr pScreen)
HARDWARE_CLIP_COLOR_8x8_FILL |
HARDWARE_CLIP_SCREEN_TO_SCREEN_COLOR_EXPAND | 0);
- if (pVia->Chipset != VIA_VX855 || pVia->Chipset != VIA_VX900)
+ if (pVia->Chipset != VIA_VX855 && pVia->Chipset != VIA_VX900)
xaaptr->ClippingFlags |= (HARDWARE_CLIP_SOLID_FILL |
HARDWARE_CLIP_SOLID_LINE |
HARDWARE_CLIP_DASHED_LINE);
diff --git a/src/via_cursor.c b/src/via_cursor.c
index 8e70cd2..518f6fa 100644
--- a/src/via_cursor.c
+++ b/src/via_cursor.c
@@ -73,6 +73,7 @@ viaHWCursorInit(ScreenPtr pScreen)
pVia->CursorSize = ((pVia->CursorMaxWidth * pVia->CursorMaxHeight) / 8) * 2;
break;
case VIA_VX900:
+ /* FIXME : ARGB cursor should work */
pVia->CursorARGBSupported = FALSE;
pVia->CursorMaxWidth = 64;
pVia->CursorMaxHeight = 64;
commit 31583431f132fe0ba185716aba501122319ea80b
Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Wed Dec 15 23:45:59 2010 +0000
Merge VX900 branch to add basic VX900 support
git-svn-id: http://svn.openchrome.org/svn/trunk@888 e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/ChangeLog b/ChangeLog
index c597424..194a41a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2010-12-16 Bartosz Kosiorek <gang65@poczta.onet.pl>
+
+ Merge vx900_branch - initial VX900 support
+
+ * src/via_accel.c: (viaFlushPCI), (viaDisableVQ),
+ (viaInitialize2DEngine), (viaAccelSync), (viaPitchHelper),
+ (viaInitXAA):
+ * src/via_bandwidth.c: (ViaSetPrimaryFIFO), (ViaSetSecondaryFIFO):
+ * src/via_bios.h:
+ * src/via_crtc.c: (ViaFirstCRTCSetMode), (ViaSecondCRTCSetMode):
+ * src/via_cursor.c: (viaHWCursorInit), (viaCursorStore),
+ (viaCursorRestore), (viaShowCursor), (viaHideCursor),
+ (viaSetCursorPosition), (viaLoadCursorImage), (viaSetCursorColors):
+ * src/via_driver.c: (VIASetupDefaultOptions), (VIAPreInit),
+ (VIALeaveVT), (VIASave), (VIARestore), (ViaMMIOEnable),
+ (ViaMMIODisable), (VIAMapFB), (VIAWriteMode), (VIACloseScreen):
+ * src/via_driver.h:
+ * src/via_id.c:
+ * src/via_id.h:
+ * src/via_mode.c: (ViaDFPDetect), (ViaOutputsDetect),
+ (ViaOutputsSelect), (ViaGetMemoryBandwidth), (ViaSetDotclock),
+ (ViaModeSet):
+ * src/via_mode.h:
+ * src/via_panel.c: (ViaPanelScaleDisable), (ViaPanelPreInit),
+ (ViaPanelGetSizeFromDDC):
+ * src/via_video.c: (DecideOverlaySupport):
+ * src/via_xvmc.c: (ViaInitXVMC):
+
2010-12-15 Bartosz Kosiorek <gang65@poczta.onet.pl>
Enable the new mode switch and panel support on K8M800 and VM800 chipsets
diff --git a/src/via_accel.c b/src/via_accel.c
index 2b02254..60f307d 100644
--- a/src/via_accel.c
+++ b/src/via_accel.c
@@ -196,6 +196,7 @@ viaFlushPCI(ViaCommandBuffer * buf)
switch (pVia->Chipset) {
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
while ((VIAGETREG(VIA_REG_STATUS) &
(VIA_CMD_RGTR_BUSY_H5 | VIA_2D_ENG_BUSY_H5))
&& (loop++ < MAXLOOP)) ;
@@ -419,6 +420,7 @@ viaDisableVQ(ScrnInfoPtr pScrn)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
VIASETREG(0x41c, 0x00100000);
VIASETREG(0x420, 0x74301000);
break;
@@ -474,16 +476,25 @@ viaInitialize2DEngine(ScrnInfoPtr pScrn)
VIASETREG(i, 0x0);
}
- if (pVia->Chipset == VIA_VX800 || pVia->Chipset == VIA_VX855) {
- for (i = 0x44; i < 0x5c; i += 4) {
+ if (pVia->Chipset == VIA_VX800 ||
+ pVia->Chipset == VIA_VX855 ||
+ pVia->Chipset == VIA_VX900) {
+ for (i = 0x44; i <= 0x5c; i += 4) {
VIASETREG(i, 0x0);
}
}
+ if (pVia->Chipset == VIA_VX900)
+ {
+ /*410 redefine 0x30 34 38*/
+ VIASETREG(0x60, 0x0); /*already useable here*/
+ }
+
/* Make the VIA_REG() macro magic work */
switch (pVia->Chipset) {
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
pVia->TwodRegs = via_2d_regs_m1;
break;
default:
@@ -496,6 +507,7 @@ viaInitialize2DEngine(ScrnInfoPtr pScrn)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
viaInitPCIe(pVia);
break;
default:
@@ -509,6 +521,7 @@ viaInitialize2DEngine(ScrnInfoPtr pScrn)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
viaEnablePCIeVQ(pVia);
break;
default:
@@ -536,6 +549,7 @@ viaAccelSync(ScrnInfoPtr pScrn)
switch (pVia->Chipset) {
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
while ((VIAGETREG(VIA_REG_STATUS) &
(VIA_CMD_RGTR_BUSY_H5 | VIA_2D_ENG_BUSY_H5 | VIA_3D_ENG_BUSY_H5))
&& (loop++ < MAXLOOP)) ;
@@ -596,7 +610,9 @@ viaPitchHelper(VIAPtr pVia, unsigned dstPitch, unsigned srcPitch)
unsigned val = (dstPitch >> 3) << 16 | (srcPitch >> 3);
RING_VARS;
- if (pVia->Chipset != VIA_VX800 && pVia->Chipset != VIA_VX855) {
+ if (pVia->Chipset != VIA_VX800 &&
+ pVia->Chipset != VIA_VX855 &&
+ pVia->Chipset != VIA_VX900) {
val |= VIA_PITCH_ENABLE;
}
OUT_RING_H1(VIA_REG(pVia, PITCH), val);
@@ -1236,7 +1252,7 @@ viaInitXAA(ScreenPtr pScreen)
HARDWARE_CLIP_COLOR_8x8_FILL |
HARDWARE_CLIP_SCREEN_TO_SCREEN_COLOR_EXPAND | 0);
- if (pVia->Chipset != VIA_VX855)
+ if (pVia->Chipset != VIA_VX855 || pVia->Chipset != VIA_VX900)
xaaptr->ClippingFlags |= (HARDWARE_CLIP_SOLID_FILL |
HARDWARE_CLIP_SOLID_LINE |
HARDWARE_CLIP_DASHED_LINE);
@@ -1300,7 +1316,9 @@ viaInitXAA(ScreenPtr pScreen)
xaaptr->SubsequentScanlineCPUToScreenColorExpandFill =
viaSubsequentScanlineCPUToScreenColorExpandFill;
xaaptr->ColorExpandBase = pVia->BltBase;
- if (pVia->Chipset == VIA_VX800 || pVia->Chipset == VIA_VX855)
+ if (pVia->Chipset == VIA_VX800 ||
+ pVia->Chipset == VIA_VX855 ||
+ pVia->Chipset == VIA_VX900)
xaaptr->ColorExpandRange = VIA_MMIO_BLTSIZE;
else
xaaptr->ColorExpandRange = (64 * 1024);
@@ -1326,7 +1344,9 @@ viaInitXAA(ScreenPtr pScreen)
xaaptr->SubsequentImageWriteRect = viaSubsequentImageWriteRect;
xaaptr->ImageWriteBase = pVia->BltBase;
- if (pVia->Chipset == VIA_VX800 || pVia->Chipset == VIA_VX855)
+ if (pVia->Chipset == VIA_VX800 ||
+ pVia->Chipset == VIA_VX855 ||
+ pVia->Chipset == VIA_VX900)
xaaptr->ImageWriteRange = VIA_MMIO_BLTSIZE;
else
xaaptr->ImageWriteRange = (64 * 1024);
diff --git a/src/via_bandwidth.c b/src/via_bandwidth.c
index 82b9bef..2b413b8 100644
--- a/src/via_bandwidth.c
+++ b/src/via_bandwidth.c
@@ -263,6 +263,14 @@ ViaSetPrimaryFIFO(ScrnInfoPtr pScrn, DisplayModePtr mode)
hwp->writeSeq(hwp, 0x18, 0x90); /* 320/4 = 80 = 0x50 */
hwp->writeSeq(hwp, 0x22, 0x28); /* 160/4 = 40 = 0x28 */
break;
+ case VIA_VX900:
+ hwp->writeSeq(hwp, 0x17, 0xC7); /* 400/2-1 = 199 = 0xC7 */
+ /* Formula for {SR16,0,5},{SR16,7,7} is: (0x50 & 0x3F) | ((0x50 & 0x40) << 1) = 0x90 */
+ hwp->writeSeq(hwp, 0x16, 0x90); /* 320/4 = 80 = 0x50 */
+ /* Formula for {SR18,0,5},{SR18,7,7} is: (0x50 & 0x3F) | ((0x50 & 0x40) << 1) = 0x90 */
+ hwp->writeSeq(hwp, 0x18, 0x90); /* 320/4 = 80 = 0x50 */
+ hwp->writeSeq(hwp, 0x22, 0x28); /* 160/4 = 40 = 0x28 */
+ break;
default:
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ViaSetPrimaryFIFO: "
"Chipset %d not implemented\n", pVia->Chipset);
@@ -479,6 +487,23 @@ ViaSetSecondaryFIFO(ScrnInfoPtr pScrn, DisplayModePtr mode)
else
ViaCrtcMask(hwp, 0x94, 0x08, 0x7F);
break;
+ case VIA_VX900:
+ /* {CR68,4,7},{CR94,7,7},{CR95,7,7} : 192/8-1 = 23 = 0x17 */
+ ViaCrtcMask(hwp, 0x68, 0x70, 0xF0); /* ((0x17 & 0x0F) << 4)) = 0x70 */
+ ViaCrtcMask(hwp, 0x94, 0x80, 0x80); /* ((0x17 & 0x10) << 3)) = 0x80 */
+ ViaCrtcMask(hwp, 0x95, 0x00, 0x80); /* ((0x17 & 0x20) << 2)) = 0x00 */
+ /* {CR68,0,3},{CR95,4,6} : 160/4 = 0x28 */
+ ViaCrtcMask(hwp, 0x68, 0x08, 0x0F); /* (0x28 & 0x0F) = 0x08 */
+ ViaCrtcMask(hwp, 0x95, 0x20, 0x70); /* (0x28 & 0x70) = 0x20 */
+ /* {CR92,0,3},{CR95,0,2} : 160/4 = 0x28 */
+ ViaCrtcMask(hwp, 0x92, 0x08, 0x08); /* (0x28 & 0x0F) = 0x08 */
+ ViaCrtcMask(hwp, 0x95, 0x02, 0x07); /* ((0x28 & 0x70) >> 4)) = 0x2 */
+ /* {CR94,0,6} : 320/4 = 0x50 */
+ if ((mode->HDisplay >= 1400) && (pScrn->bitsPerPixel == 32))
+ ViaCrtcMask(hwp, 0x94, 0x08, 0x7F);
+ else
+ ViaCrtcMask(hwp, 0x94, 0x08, 0x7F);
+ break;
default:
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ViaSetSecondaryFIFO: "
"Chipset %d not implemented\n", pVia->Chipset);
diff --git a/src/via_bios.h b/src/via_bios.h
index cf8ba88..6d945f7 100644
--- a/src/via_bios.h
+++ b/src/via_bios.h
@@ -97,7 +97,9 @@
#define VIA_MEM_DDR400 0x06
#define VIA_MEM_DDR533 0x07
#define VIA_MEM_DDR667 0x08
-#define VIA_MEM_END 0x09
+#define VIA_MEM_DDR800 0x09
+#define VIA_MEM_DDR1066 0x0A
+#define VIA_MEM_END 0x0B
#define VIA_MEM_NONE 0xFF
/* Digital Output Bus Width */
diff --git a/src/via_crtc.c b/src/via_crtc.c
index bd5edb3..df5ffd7 100644
--- a/src/via_crtc.c
+++ b/src/via_crtc.c
@@ -174,6 +174,7 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
break;
default:
ViaSeqMask(hwp, 0x16, 0x08, 0xBF);
@@ -278,6 +279,7 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
break;
default:
/* some leftovers */
@@ -314,6 +316,7 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
break;
default:
/* some leftovers */
@@ -439,6 +442,7 @@ ViaSecondCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
break;
default:
ViaSeqMask(hwp, 0x16, 0x08, 0xBF);
@@ -523,6 +527,7 @@ ViaSecondCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
break;
default:
/* some leftovers */
diff --git a/src/via_cursor.c b/src/via_cursor.c
index 2e3ab6f..8e70cd2 100644
--- a/src/via_cursor.c
+++ b/src/via_cursor.c
@@ -72,6 +72,12 @@ viaHWCursorInit(ScreenPtr pScreen)
pVia->CursorMaxHeight = 32;
pVia->CursorSize = ((pVia->CursorMaxWidth * pVia->CursorMaxHeight) / 8) * 2;
break;
+ case VIA_VX900:
+ pVia->CursorARGBSupported = FALSE;
+ pVia->CursorMaxWidth = 64;
+ pVia->CursorMaxHeight = 64;
+ pVia->CursorSize = pVia->CursorMaxWidth * (pVia->CursorMaxHeight + 1) << 2;
+ break;
default:
pVia->CursorARGBSupported = TRUE;
pVia->CursorMaxWidth = 64;
@@ -98,6 +104,7 @@ viaHWCursorInit(ScreenPtr pScreen)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
if (pVia->pBIOSInfo->FirstCRTC->IsActive) {
pVia->CursorRegControl = VIA_REG_HI_CONTROL0;
pVia->CursorRegBase = VIA_REG_HI_BASE0;
@@ -169,6 +176,7 @@ viaHWCursorInit(ScreenPtr pScreen)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
if (pVia->pBIOSInfo->FirstCRTC->IsActive) {
VIASETREG(VIA_REG_PRIM_HI_INVTCOLOR, 0x00FFFFFF);
VIASETREG(VIA_REG_V327_HI_INVTCOLOR, 0x00FFFFFF);
@@ -228,6 +236,7 @@ viaCursorStore(ScrnInfoPtr pScrn)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
if (pVia->pBIOSInfo->FirstCRTC->IsActive) {
pVia->CursorPrimHiInvtColor = VIAGETREG(VIA_REG_PRIM_HI_INVTCOLOR);
pVia->CursorV327HiInvtColor = VIAGETREG(VIA_REG_V327_HI_INVTCOLOR);
@@ -268,6 +277,7 @@ viaCursorRestore(ScrnInfoPtr pScrn)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
if (pVia->pBIOSInfo->FirstCRTC->IsActive) {
VIASETREG(VIA_REG_PRIM_HI_INVTCOLOR, pVia->CursorPrimHiInvtColor);
VIASETREG(VIA_REG_V327_HI_INVTCOLOR, pVia->CursorV327HiInvtColor);
@@ -301,6 +311,7 @@ viaShowCursor(ScrnInfoPtr pScrn)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
if (pVia->pBIOSInfo->FirstCRTC->IsActive) {
VIASETREG(VIA_REG_HI_CONTROL0, 0x36000005);
}
@@ -347,6 +358,7 @@ viaHideCursor(ScrnInfoPtr pScrn)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
if (pVia->pBIOSInfo->FirstCRTC->IsActive) {
temp = VIAGETREG(VIA_REG_HI_CONTROL0);
VIASETREG(VIA_REG_HI_CONTROL0, temp & 0xFFFFFFFA);
@@ -395,6 +407,7 @@ viaSetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
if (pVia->pBIOSInfo->FirstCRTC->IsActive) {
VIASETREG(VIA_REG_HI_POS0, ((x << 16) | (y & 0x07ff)));
VIASETREG(VIA_REG_HI_OFFSET0, ((xoff << 16) | (yoff & 0x07ff)));
@@ -482,6 +495,7 @@ viaLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
if (pVia->pBIOSInfo->FirstCRTC->IsActive) {
temp = VIAGETREG(VIA_REG_HI_CONTROL0);
VIASETREG(VIA_REG_HI_CONTROL0, temp & 0xFFFFFFFE);
@@ -538,6 +552,7 @@ viaSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
if (pVia->pBIOSInfo->FirstCRTC->IsActive) {
temp = VIAGETREG(VIA_REG_HI_CONTROL0);
VIASETREG(VIA_REG_HI_CONTROL0, temp & 0xFFFFFFFE);
diff --git a/src/via_driver.c b/src/via_driver.c
index ec62102..28ef7bd 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -143,6 +143,7 @@ static const struct pci_id_match via_device_match[] = {
VIA_DEVICE_MATCH (PCI_CHIP_VT3327, 0 ),
VIA_DEVICE_MATCH (PCI_CHIP_VT3353, 0 ),
VIA_DEVICE_MATCH (PCI_CHIP_VT3409, 0 ),
+ VIA_DEVICE_MATCH (PCI_CHIP_VT3410, 0 ),
{ 0, 0, 0 },
};
@@ -180,6 +181,7 @@ static SymTabRec VIAChipsets[] = {
{VIA_P4M900, "P4M900/VN896/CN896"},
{VIA_VX800, "VX800/VX820"},
{VIA_VX855, "VX855/VX875"},
+ {VIA_VX900, "VX900"},
{-1, NULL }
};
@@ -196,6 +198,7 @@ static PciChipsets VIAPciChipsets[] = {
{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}
};
@@ -760,6 +763,7 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn)
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
pVia->VideoEngine = VIDEO_ENGINE_CME;
pVia->agpEnable = FALSE;
pVia->dmaXV = FALSE;
@@ -865,6 +869,7 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
pVIAEnt->HasSecondary = FALSE;
pVIAEnt->RestorePrimary = FALSE;
pVIAEnt->IsSecondaryRestored = FALSE;
+
}
} else {
pVia->sharedData = xnfcalloc(sizeof(ViaSharedRec), 1);
@@ -1034,6 +1039,7 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
case VIA_CX700:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
#ifdef XSERVER_LIBPCIACCESS
pci_device_cfg_read_u8(vgaDevice, &videoRam, 0xA1);
#else
@@ -1591,10 +1597,13 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
} else {
if (pVia->pI2CBus1) {
- pVia->DDC1 = xf86DoEDID_DDC2(pScrn->scrnIndex, pVia->pI2CBus1);
+ pVia->DDC1 = xf86DoEEDID(pScrn->scrnIndex, pVia->pI2CBus1, TRUE);
if (pVia->DDC1) {
xf86PrintEDID(pVia->DDC1);
xf86SetDDCproperties(pScrn, pVia->DDC1);
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+ "DDC pI2CBus1 detected a %s\n", DIGITAL(pVia->DDC1->features.input_type) ?
+ "DFP" : "CRT"));
}
}
}
@@ -1897,6 +1906,7 @@ VIALeaveVT(int scrnIndex, int flags)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
break;
default:
hwp->writeSeq(hwp, 0x1A, pVia->SavedReg.SR1A | 0x40);
@@ -2054,6 +2064,9 @@ VIASave(ScrnInfoPtr pScrn)
Regs->SR4C = hwp->readSeq(hwp, 0x4C);
break;
}
+
+ /* Save Preemptive Arbiter Control Register */
+ Regs->SR4C = hwp->readSeq(hwp, 0x4D);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Crtc...\n"));
Regs->CR13 = hwp->readCrtc(hwp, 0x13);
@@ -2111,6 +2124,7 @@ VIASave(ScrnInfoPtr pScrn)
case VIA_CX700:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
Regs->CRD2 = hwp->readCrtc(hwp, 0xD2);
break;
}
@@ -2220,6 +2234,15 @@ VIARestore(ScrnInfoPtr pScrn)
break;
}
+ /* Restore Preemptive Arbiter Control Register
+ * VX800 and VX855 should restore this register too,
+ * but I don't do that for I don't want to affect any
+ * chips now.
+ */
+ if (pVia->Chipset == VIA_VX900) {
+ hwp->writeSeq(hwp, 0x4D, Regs->SR4D);
+ }
+
/* Reset dotclocks. */
ViaSeqMask(hwp, 0x40, 0x06, 0x06);
ViaSeqMask(hwp, 0x40, 0x00, 0x06);
@@ -2274,6 +2297,7 @@ VIARestore(ScrnInfoPtr pScrn)
case VIA_CX700:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
/* LVDS Control Register */
hwp->writeCrtc(hwp, 0xD2, Regs->CRD2);
break;
@@ -2303,6 +2327,7 @@ ViaMMIOEnable(ScrnInfoPtr pScrn)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
ViaSeqMask(hwp, 0x1A, 0x08, 0x08);
break;
default:
@@ -2326,6 +2351,7 @@ ViaMMIODisable(ScrnInfoPtr pScrn)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
ViaSeqMask(hwp, 0x1A, 0x00, 0x08);
break;
default:
@@ -2442,10 +2468,18 @@ VIAMapFB(ScrnInfoPtr pScrn)
VIAPtr pVia = VIAPTR(pScrn);
#ifdef XSERVER_LIBPCIACCESS
- pVia->FrameBufferBase = pVia->PciInfo->regions[0].base_addr;
+ if (pVia->Chipset == VIA_VX900) {
+ pVia->FrameBufferBase = pVia->PciInfo->regions[2].base_addr;
+ } else {
+ pVia->FrameBufferBase = pVia->PciInfo->regions[0].base_addr;
+ }
int err;
#else
- pVia->FrameBufferBase = pVia->PciInfo->memBase[0];
+ if (pVia->Chipset == VIA_VX900) {
+ pVia->FrameBufferBase = pVia->PciInfo->memBase[2];
+ } else {
+ pVia->FrameBufferBase = pVia->PciInfo->memBase[0];
+ }
#endif
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIAMapFB\n"));
@@ -3029,6 +3063,7 @@ VIAWriteMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
/*
* Since we are using virtual, we need to adjust
* the offset to match the framebuffer alignment.
@@ -3075,6 +3110,7 @@ VIACloseScreen(int scrnIndex, ScreenPtr pScreen)
case VIA_P4M900:
case VIA_VX800:
case VIA_VX855:
+ case VIA_VX900:
break;
default :
hwp->writeSeq(hwp, 0x1A, pVia->SavedReg.SR1A | 0x40);
diff --git a/src/via_driver.h b/src/via_driver.h
index 4c99cf9..891cccb 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -127,7 +127,7 @@ typedef struct {
CARD8 SR27, SR28, SR29, SR2A,SR2B,SR2C,SR2D,SR2E;
CARD8 SR2F, SR30, SR31, SR32,SR33,SR34,SR40,SR41;
CARD8 SR42, SR43, SR44, SR45,SR46,SR47,SR48,SR49;
- CARD8 SR4A, SR4B, SR4C;
+ CARD8 SR4A, SR4B, SR4C, SR4D;
/* extended CRTC registers */
CARD8 CR0C, CR0D;
diff --git a/src/via_id.c b/src/via_id.c
index 0d24221..b5b9000 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -239,6 +239,9 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"VIA VT8562C", VIA_VX855, 0x1106, 0x5122, VIA_DEVICE_CRT},
{"OLPC XO 1.5", VIA_VX855, 0x152D, 0x0833, VIA_DEVICE_LCD},
+ /*** VX900 ***/
+ {"Foxconn L740", VIA_VX900, 0x105B, 0x0CFD, VIA_DEVICE_LCD | VIA_DEVICE_CRT},
+
/* keep this */
Reply to: