xserver-xorg-video-openchrome: Changes to 'upstream-experimental'
ChangeLog | 7 +++++++
src/via_cursor.c | 7 -------
src/via_dri.c | 21 +++++++++++++--------
src/via_driver.c | 18 ++++++++++++------
src/via_id.c | 6 +++++-
src/via_mode.c | 5 +++--
src/via_panel.c | 9 +++------
src/via_video.c | 1 +
8 files changed, 44 insertions(+), 30 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},
Reply to: