summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Kosiorek <gang65@poczta.onet.pl>2011-01-23 21:03:13 +0000
committerBartosz Kosiorek <gang65@poczta.onet.pl>2011-01-23 21:03:13 +0000
commit3dce43dd3301a8b24f37a2cb8b3d7c3d07e996d2 (patch)
treef88af93d66ccf927962607ecf1ce4f63ab57ad6a
parent327e61842ead94ef47aa312025aa60d6f2f7f575 (diff)
Fix hardware cursor for VX900
-rw-r--r--ChangeLog7
-rw-r--r--src/via_cursor.c7
-rw-r--r--src/via_mode.c5
3 files changed, 10 insertions, 9 deletions
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 {