rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.903-latest_snapshot.patch, 1.2, 1.3 xorg-x11-drv-openchrome.spec, 1.34, 1.35
Xavier Bachelot
xavierb at fedoraproject.org
Mon Jan 5 19:43:57 UTC 2009
Author: xavierb
Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8474
Modified Files:
openchrome-0.2.903-latest_snapshot.patch
xorg-x11-drv-openchrome.spec
Log Message:
trunk rev 711
openchrome-0.2.903-latest_snapshot.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 openchrome-0.2.903-latest_snapshot.patch
Index: openchrome-0.2.903-latest_snapshot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/openchrome-0.2.903-latest_snapshot.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openchrome-0.2.903-latest_snapshot.patch 30 Dec 2008 01:54:40 -0000 1.2
+++ openchrome-0.2.903-latest_snapshot.patch 5 Jan 2009 19:43:26 -0000 1.3
@@ -1,7 +1,7 @@
Index: configure.ac
===================================================================
---- configure.ac (.../tags/release_0_2_903) (revision 696)
-+++ configure.ac (.../trunk) (revision 696)
+--- configure.ac (.../tags/release_0_2_903) (revision 711)
++++ configure.ac (.../trunk) (revision 711)
@@ -70,7 +70,7 @@
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
@@ -55,8 +55,8 @@
AC_DEFINE(XSERVER_LIBPCIACCESS,1,[Enable libpciaccess])
Index: libxvmc/Makefile.am
===================================================================
---- libxvmc/Makefile.am (.../tags/release_0_2_903) (revision 696)
-+++ libxvmc/Makefile.am (.../trunk) (revision 696)
+--- libxvmc/Makefile.am (.../tags/release_0_2_903) (revision 711)
++++ libxvmc/Makefile.am (.../trunk) (revision 711)
@@ -24,13 +24,13 @@
xf86dristr.h \
vldXvMC.h
@@ -77,8 +77,8 @@
driDrawable.c \
Index: libxvmc/viaLowLevelPro.c
===================================================================
---- libxvmc/viaLowLevelPro.c (.../tags/release_0_2_903) (revision 696)
-+++ libxvmc/viaLowLevelPro.c (.../trunk) (revision 696)
+--- libxvmc/viaLowLevelPro.c (.../tags/release_0_2_903) (revision 711)
++++ libxvmc/viaLowLevelPro.c (.../trunk) (revision 711)
@@ -1460,13 +1460,13 @@
if (size != mem->size) {
@@ -106,8 +106,8 @@
Index: libxvmc/viaXvMC.c
===================================================================
---- libxvmc/viaXvMC.c (.../tags/release_0_2_903) (revision 696)
-+++ libxvmc/viaXvMC.c (.../trunk) (revision 696)
+--- libxvmc/viaXvMC.c (.../tags/release_0_2_903) (revision 711)
++++ libxvmc/viaXvMC.c (.../trunk) (revision 711)
@@ -248,7 +248,7 @@
return errType;
}
@@ -384,9 +384,92 @@
Index: ChangeLog
===================================================================
---- ChangeLog (.../tags/release_0_2_903) (revision 696)
-+++ ChangeLog (.../trunk) (revision 696)
-@@ -1,3 +1,149 @@
+--- ChangeLog (.../tags/release_0_2_903) (revision 711)
++++ ChangeLog (.../trunk) (revision 711)
+@@ -1,3 +1,232 @@
++2009-01-06 Jon Nettleton <jon.nettleton at gmail.com>
++
++ * src/via_mode.c: (ViaModesMonitorFixup), (ViaModesAttachHelper):
++
++ Make sure that the monitor settings will handle our
++ internal Modes set for TV out and LCD Panels.
++
++2009-01-05 Jon Nettleton <jon.nettleton at gmail.com>
++
++ * src/via_cursor.c: (viaHWCursorInit), (viaLoadCursorImage):
++
++ A couple more tweaks to fix mono hardware cursor on older
++ chipsets.
++
++2009-01-05 Jon Nettleton <jon.nettleton at gmail.com>
++
++ * src/via_cursor.c: (viaHWCursorInit), (viaUseHWCursorARGB),
++ (viaUseHWCursor):
++ * src/via_driver.c: (VIAScreenInit):
++
++ Missed a couple of changes for the chipset specific
++ cursors. Moved chipset detection to HWInit. Removed
++ some extraneous debugging.
++
++2009-01-04 Gabriel Mansi <gabriel-dot-mansi-at-gmail-dot-com>
++
++ * src/via.h:
++ * src/via_accel.c: (viaInitialize2DEngine):
++ * src/via_crtc.c: (ViaFirstCRTCSetMode), (ViaSecondCRTCSetMode):
++ * src/via_driver.c: (ViaMMIOEnable), (ViaMMIODisable),
++ (VIAWriteMode):
++ * src/via_swov.c: (SetFIFO_V3), (Upd_Video):
++ * src/via_video.c: (DecideOverlaySupport):
++
++ Initial XVideo support for VX800.
++
++2009-01-04 Jon Nettleton <jon.nettleton at gmail.com>
++
++ * src/via_cursor.c: (viaHWCursorInit), (viaCursorSetFB),
++ (viaUseHWCursorARGB), (viaUseHWCursor), (viaLoadCursorImage),
++ (viaSetCursorColors), (viaLoadCursorARGB):
++ * src/via_driver.h:
++
++ Okay I tried to cheat. We need to have some chipset
++ specific intelligence. I have added this back into
++ the initial test to check for HWCursor support.
++
++2009-01-04 Jon Nettleton <jon.nettleton at gmail.com>
++
++ * src/via_accel.c: (viaInitXAA), (viaInitAccel):
++ * src/via_crtc.c: (ViaSecondCRTCSetStartingAddress):
++ * src/via_cursor.c: (viaHWCursorInit), (viaCursorSetFB),
++ (viaCursorStore), (viaCursorRestore), (viaShowCursor),
++ (viaHideCursor), (viaSetCursorPosition), (viaUseHWCursorARGB),
++ (viaUseHWCursor), (viaLoadCursorImage), (viaSetCursorColors),
++ (viaLoadCursorARGB):
++ * src/via_dga.c: (VIADGASetMode):
++ * src/via_driver.c: (VIAFreeRec), (VIASetupDefaultOptions),
++ (VIAPreInit), (VIAEnterVT), (VIALeaveVT), (VIAScreenInit),
++ (VIACloseScreen):
++ * src/via_driver.h:
++ * src/via_regs.h:
++
++ This is a take at reworking HWCursor. It works off the
++ ttm_branch and the work done in the randr_branch. It only needs
++ marginal testing as HWCursor was already very broken.
++
++2009-01-04 Jon Nettleton <jon.nettleton at gmail.com>
++
++ * src/via_driver.c: (VIAMapMMIO), (VIAMapFB):
++
++ Moved pVia->FrameBufferBase setting to within
++ VIAMapFB where it was before being called without
++ being set.
++
++2009-01-04 Jon Nettleton <jon.nettleton at gmail.com>
++
++ * src/via_driver.c: (VIAPreInit):
++
++ Patch submitted by Robert Bridge to clean up compiler
++ warnings. Should close trac ticket #243. Thanks
++ RobbieAB.
++
+2008-12-29 Jon Nettleton <jon.nettleton at gmail.com>
+
+ * src/via_accel.c: (viaInitXAA):
@@ -539,7 +622,7 @@
Index: src/via_panel.c
===================================================================
--- src/via_panel.c (.../tags/release_0_2_903) (revision 0)
-+++ src/via_panel.c (.../trunk) (revision 696)
++++ src/via_panel.c (.../trunk) (revision 711)
@@ -0,0 +1,461 @@
+/*
+ * Copyright 2007 The Openchrome Project [openchrome.org]
@@ -1004,8 +1087,8 @@
+}
Index: src/via_id.h
===================================================================
---- src/via_id.h (.../tags/release_0_2_903) (revision 696)
-+++ src/via_id.h (.../trunk) (revision 696)
+--- src/via_id.h (.../tags/release_0_2_903) (revision 711)
++++ src/via_id.h (.../trunk) (revision 711)
@@ -37,6 +37,7 @@
VIA_P4M900,
VIA_CX700,
@@ -1024,8 +1107,8 @@
* the CLE266, often labelled Ax and Cx. The dividing line seems to be
Index: src/via_video.c
===================================================================
---- src/via_video.c (.../tags/release_0_2_903) (revision 696)
-+++ src/via_video.c (.../trunk) (revision 696)
+--- src/via_video.c (.../tags/release_0_2_903) (revision 711)
++++ src/via_video.c (.../trunk) (revision 711)
@@ -112,11 +112,7 @@
static int viaSetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
static int viaPutImage(ScrnInfoPtr, short, short, short, short, short, short,
@@ -1039,7 +1122,17 @@
static void nv12Blit(unsigned char *nv12Chroma,
const unsigned char *uBuffer,
const unsigned char *vBuffer,
-@@ -370,14 +366,14 @@
+@@ -282,7 +278,8 @@
+ pVia->ChipId != PCI_CHIP_VT3327 &&
+ pVia->ChipId != PCI_CHIP_VT3336 &&
+ pVia->ChipId != PCI_CHIP_VT3364 &&
+- pVia->ChipId != PCI_CHIP_VT3324) {
++ pVia->ChipId != PCI_CHIP_VT3324 &&
++ pVia->ChipId != PCI_CHIP_VT3353) {
+ CARD32 bandwidth = (mode->HDisplay >> 4) * (mode->VDisplay >> 5) *
+ pScrn->bitsPerPixel * mode->VRefresh;
+
+@@ -370,14 +367,14 @@
if (pVia->pVbe) {
refresh = 100;
@@ -1058,7 +1151,7 @@
if ((width == 1400) && (height == 1050)) {
width = 1280;
[...2384 lines suppressed...]
++ *dst++ = 0;
+ }
-+ viaCursorShow(pScrn);
-+}
+
-+#endif
++ for (; y < pVia->CursorMaxHeight; y++)
++ for (x = 0; x < pVia->CursorMaxWidth; x++)
++ *dst++ = 0;
+
-+Bool
-+viaCursorRecInit(ScrnInfoPtr pScrn)
-+{
-+ VIAPtr pVia = VIAPTR(pScrn);
-+
-+ if (!pVia->cursor)
-+ pVia->cursor =
-+ (ViaCursorInfoPtr) xnfcalloc(sizeof(ViaCursorInfoRec), 1);
-+
-+ if (pVia->cursor) {
-+ ViaCursorInfoPtr cursor = pVia->cursor;
-+
-+ switch (pVia->Chipset) {
-+ case VIA_CLE266:
-+ case VIA_KM400:
-+ case VIA_K8M800:
-+ cursor->isARGBSupported = FALSE;
-+ cursor->isARGBEnabled = FALSE;
-+ cursor->maxWidth = 32;
-+ cursor->maxHeight = 32;
-+ cursor->size = ((cursor->maxWidth * cursor->maxHeight) / 8) * 2;
-+ break;
-+ default:
-+ cursor->isARGBSupported = TRUE;
-+ cursor->isARGBEnabled = TRUE;
-+ cursor->maxWidth = 64;
-+ cursor->maxHeight = 64;
-+ cursor->size = cursor->maxWidth * cursor->maxHeight * 4;
-+ break;
-+ }
-+ }
-+
-+ return pVia->cursor != NULL;
-+}
-+
-+void
-+viaCursorRecDestroy(ScrnInfoPtr pScrn)
-+{
-+ VIAPtr pVia = VIAPTR(pScrn);
-+
-+ if (pVia->cursor)
-+ xfree(pVia->cursor);
-+}
-+
-+static Bool
-+viaCursorHWUse(ScreenPtr pScreen, CursorPtr pCurs)
-+{
-+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+ VIAPtr pVia = VIAPTR(pScrn);
-+
-+ return (pVia->cursor->isHWCursorEnabled
-+ /* Can't enable HW cursor on both CRTCs at the same time. */
-+ && !(pVia->pBIOSInfo->FirstCRTC->IsActive
-+ && pVia->pBIOSInfo->SecondCRTC->IsActive)
-+ && pCurs->bits->width <= pVia->cursor->maxWidth
-+ && pCurs->bits->height <= pVia->cursor->maxHeight);
-+}
++ VIASETREG(control, temp);
+ }
Index: src/via_xvmc.c
===================================================================
---- src/via_xvmc.c (.../tags/release_0_2_903) (revision 696)
-+++ src/via_xvmc.c (.../trunk) (revision 696)
+--- src/via_xvmc.c (.../tags/release_0_2_903) (revision 711)
++++ src/via_xvmc.c (.../trunk) (revision 711)
@@ -114,11 +114,7 @@
static int viaXvMCInterceptPutImage(ScrnInfoPtr, short, short, short, short,
short, short, short, short, int,
@@ -6366,8 +6578,8 @@
unsigned long
Index: src/via_vt162x.h
===================================================================
---- src/via_vt162x.h (.../tags/release_0_2_903) (revision 696)
-+++ src/via_vt162x.h (.../trunk) (revision 696)
+--- src/via_vt162x.h (.../tags/release_0_2_903) (revision 711)
++++ src/via_vt162x.h (.../trunk) (revision 711)
@@ -926,6 +926,23 @@
0x0, 0x0,
},
@@ -6392,10 +6604,44 @@
{ "720x576", 720, 576, TVTYPE_PAL, 0, 0,
/* 00 0F */
{ 0x03, 0x00, 0x10, 0x1f, 0x03, 0x00, 0x00, 0xc9, 0x4c, 0x11, 0x7c, 0x00, 0x56, 0x57, 0x07, 0xbf,
+Index: src/via.h
+===================================================================
+--- src/via.h (.../tags/release_0_2_903) (revision 711)
++++ src/via.h (.../trunk) (revision 711)
+@@ -561,9 +561,6 @@
+ #define HQV_V_FILTER_DEFAULT 0x00420000
+ #define HQV_H_FILTER_DEFAULT 0x00000040
+
+-
+-
+-
+ /* HQV_MINI_CONTROL 0x3E8 */
+ #define HQV_H_MINIFY_ENABLE 0x00000800
+ #define HQV_H_MINIFY_DOWN 0x00001000
+@@ -572,6 +569,19 @@
+ #define HQV_VDEBLOCK_FILTER 0x80000000
+ #define HQV_HDEBLOCK_FILTER 0x00008000
+
++/* Add new HQV Registers for VT3353: */
++#define HQV_SRC_DATA_OFFSET_CONTROL1 0x180
++#define HQV_SRC_DATA_OFFSET_CONTROL2 0x184
++#define HQV_SRC_DATA_OFFSET_CONTROL3 0x188
++#define HQV_SRC_DATA_OFFSET_CONTROL4 0x18C
++#define HQV_HW_TUNING_PERFORMANCE 0x190
++#define HQV_EXTENDED_CONTROL 0x194
++#define HQV_STATIC_RECORD_FB_STARTADDR 0x198
++#define HQV_STATIC_RECORD_FB_STRIDE 0x19C
++#define HQV_COLOR_ADJUSTMENT_CONTROL1 0x1A0
++#define HQV_COLOR_ADJUSTMENT_CONTROL2 0x1A4
++#define HQV_COLOR_ADJUSTMENT_CONTROL3 0x1A8
++#define HQV_COLOR_ADJUSTMENT_CONTROL5 0x1AC
+
+ #define CHROMA_KEY_LOW 0x00FFFFFF
+ #define CHROMA_KEY_HIGH 0x00FFFFFF
Index: src/via_timing.c
===================================================================
--- src/via_timing.c (.../tags/release_0_2_903) (revision 0)
-+++ src/via_timing.c (.../trunk) (revision 696)
++++ src/via_timing.c (.../trunk) (revision 711)
@@ -0,0 +1,398 @@
+/*
+ * Copyright 2007-2008 Gabriel Mansi.
@@ -6797,8 +7043,8 @@
+}
Index: src/Makefile.am
===================================================================
---- src/Makefile.am (.../tags/release_0_2_903) (revision 696)
-+++ src/Makefile.am (.../trunk) (revision 696)
+--- src/Makefile.am (.../tags/release_0_2_903) (revision 711)
++++ src/Makefile.am (.../trunk) (revision 711)
@@ -43,23 +43,29 @@
via_ch7xxx.c \
via_ch7xxx.h \
@@ -6831,34 +7077,30 @@
via_vgahw.h \
Index: src/via_dga.c
===================================================================
---- src/via_dga.c (.../tags/release_0_2_903) (revision 696)
-+++ src/via_dga.c (.../trunk) (revision 696)
-@@ -247,8 +247,8 @@
- pScrn->depth = pVia->DGAOldDepth;
+--- src/via_dga.c (.../tags/release_0_2_903) (revision 711)
++++ src/via_dga.c (.../trunk) (revision 711)
+@@ -248,7 +248,7 @@
pScrn->SwitchMode(index, pScrn->currentMode, 0);
-- if (pVia->hwcursor)
+ if (pVia->hwcursor)
- VIAShowCursor(pScrn);
-+ if (pVia->cursor->isHWCursorEnabled)
-+ viaCursorShow(pScrn);
++ viaShowCursor(pScrn);
pVia->DGAactive = FALSE;
}
-@@ -260,8 +260,8 @@
- pMode->bitsPerPixel, pMode->depth);
+@@ -261,7 +261,7 @@
#endif
-- if (pVia->hwcursor)
+ if (pVia->hwcursor)
- VIAHideCursor(pScrn);
-+ if (pVia->cursor->isHWCursorEnabled)
-+ viaCursorHide(pScrn);
++ viaHideCursor(pScrn);
if (!pVia->DGAactive) { /* save the old parameters */
pVia->DGAOldDisplayWidth = pScrn->displayWidth;
Index: src/via_id.c
===================================================================
---- src/via_id.c (.../tags/release_0_2_903) (revision 696)
-+++ src/via_id.c (.../trunk) (revision 696)
+--- src/via_id.c (.../tags/release_0_2_903) (revision 711)
++++ src/via_id.c (.../trunk) (revision 711)
@@ -87,6 +87,7 @@
{"Asustek K8V-MX", VIA_K8M800, 0x1043, 0x8129, VIA_DEVICE_CRT},
{"Mitac 8399", VIA_K8M800, 0x1071, 0x8399, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, /* aka "Pogolinux Konabook 3100" */
@@ -6918,7 +7160,7 @@
Index: src/via_timing.h
===================================================================
--- src/via_timing.h (.../tags/release_0_2_903) (revision 0)
-+++ src/via_timing.h (.../trunk) (revision 696)
++++ src/via_timing.h (.../trunk) (revision 711)
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2007-2008 Gabriel Mansi.
Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xorg-x11-drv-openchrome.spec 30 Dec 2008 18:58:21 -0000 1.34
+++ xorg-x11-drv-openchrome.spec 5 Jan 2009 19:43:26 -0000 1.35
@@ -10,7 +10,7 @@
Summary: Xorg X11 openchrome video driver
Name: xorg-x11-drv-openchrome
Version: 0.2.903
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://www.openchrome.org
License: MIT
Group: User Interface/X Hardware Support
@@ -123,6 +123,9 @@
%changelog
+* Mon Jan 05 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-5
+- Update to latest snapshot (svn 711), fix hardware cursor and add VX800 Xv.
+
* Tue Dec 30 2008 Xavier Bachelot <xavier at bachelot.org> - 0.2.903-4
- Fix autoreconf call.
More information about the fedora-extras-commits
mailing list