[xorg-x11-drv-openchrome] 0.2.904 + svn933
Xavier Bachelot
xavierb at fedoraproject.org
Sun Sep 11 16:19:47 UTC 2011
commit 54b7d85e6b845fe3c4c411d1f4760de934c6b8b6
Author: Xavier Bachelot <xavier at bachelot.org>
Date: Sun Sep 11 18:16:12 2011 +0200
0.2.904 + svn933
...svn921.patch => openchrome-0.2.904-svn933.patch | 225 ++++++++++++--------
1 files changed, 135 insertions(+), 90 deletions(-)
---
diff --git a/openchrome-0.2.904-svn921.patch b/openchrome-0.2.904-svn933.patch
similarity index 96%
rename from openchrome-0.2.904-svn921.patch
rename to openchrome-0.2.904-svn933.patch
index dd75e60..b37a16c 100644
--- a/openchrome-0.2.904-svn921.patch
+++ b/openchrome-0.2.904-svn933.patch
@@ -1,8 +1,20 @@
Index: ChangeLog
===================================================================
---- ChangeLog (.../tags/release_0_2_904) (revision 921)
-+++ ChangeLog (.../trunk) (revision 921)
-@@ -1,3 +1,225 @@
+--- ChangeLog (.../tags/release_0_2_904) (revision 977)
++++ ChangeLog (.../trunk) (revision 977)
+@@ -1,3 +1,237 @@
++2011-05-10 Bartosz Kosiorek <gang65 at poczta.onet.pl>
++
++ Workaround EXA crash with new libcairo2 (#298)
++
++ * src/via_accel.c: (viaExaPrepareComposite):
++
++2011-05-08 Bartosz Kosiorek <gang65 at poczta.onet.pl>
++
++ Fix cursor garbage after suspend/resume for Xserver 1.10 (#405)
++
++ * src/via_video.c: (viaRestoreVideo):
++
+2011-05-04 Bartosz Kosiorek <gang65 at poczta.onet.pl>
+
+ Fix XAA displaying issues
@@ -230,8 +242,8 @@ Index: ChangeLog
Save/restore ECK Clock Synthesizer
Index: src/via_panel.c
===================================================================
---- src/via_panel.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_panel.c (.../trunk) (revision 921)
+--- src/via_panel.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_panel.c (.../trunk) (revision 977)
@@ -45,17 +45,17 @@ static ViaPanelModeRec ViaPanelNativeModes[] = {
{1280, 768},
{1280, 1024},
@@ -457,8 +469,8 @@ Index: src/via_panel.c
Index: src/via_id.h
===================================================================
---- src/via_id.h (.../tags/release_0_2_904) (revision 921)
-+++ src/via_id.h (.../trunk) (revision 921)
+--- src/via_id.h (.../tags/release_0_2_904) (revision 977)
++++ src/via_id.h (.../trunk) (revision 977)
@@ -39,6 +39,7 @@ enum VIACHIPTAGS {
VIA_P4M890,
VIA_VX800,
@@ -477,8 +489,8 @@ Index: src/via_id.h
* 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_904) (revision 921)
-+++ src/via_video.c (.../trunk) (revision 921)
+--- src/via_video.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_video.c (.../trunk) (revision 977)
@@ -354,6 +354,14 @@ DecideOverlaySupport(ScrnInfoPtr pScrn)
mClock = 333;
memEfficiency = (float)SINGLE_3205_133;
@@ -534,7 +546,7 @@ Index: src/via_video.c
}
void
-@@ -496,16 +504,66 @@ viaRestoreVideo(ScrnInfoPtr pScrn)
+@@ -496,16 +504,83 @@ viaRestoreVideo(ScrnInfoPtr pScrn)
{
VIAPtr pVia = VIAPTR(pScrn);
vmmtr viaVidEng = (vmmtr) pVia->VidMapBase;
@@ -557,6 +569,10 @@ Index: src/via_video.c
+ viaVidEng->chroma_up = localVidEng->chroma_up;
+ viaVidEng->interruptflag = localVidEng->interruptflag;
+- viaVidEng->video1_ctl = pVia->dwV1;
+- viaVidEng->video3_ctl = pVia->dwV3;
+- viaVidEng->compose = 0x80000000;
+- viaVidEng->compose = 0x40000000;
+ if (pVia->ChipId != PCI_CHIP_VT3314)
+ {
+ /*VT3314 only has V3*/
@@ -572,9 +588,25 @@ Index: src/via_video.c
+ viaVidEng->video1y_addr0 = localVidEng->video1y_addr0;
+ viaVidEng->video1_fifo = localVidEng->video1_fifo;
+ viaVidEng->video1y_addr3 = localVidEng->video1y_addr3;
-+ viaVidEng->v1_source_w_h = localVidEng->v1_source_w_h ;
++ viaVidEng->v1_source_w_h = localVidEng->v1_source_w_h;
+ viaVidEng->video1_CSC1 = localVidEng->video1_CSC1;
+ viaVidEng->video1_CSC2 = localVidEng->video1_CSC2;
+
++ /* Fix cursor garbage after suspend for VX855 and VX900 (#405) */
++ /* 0x2E4 T Signature Data Result 1 */
++ viaVidEng->video1u_addr1 = localVidEng->video1u_addr1;
++ /* 0x2E8 HI for Primary Display FIFO Control Signal */
++ viaVidEng->video1u_addr2 = localVidEng->video1u_addr2;
++ /* 0x2EC HI for Primary Display FIFO Transparent color */
++ viaVidEng->video1u_addr3 = localVidEng->video1u_addr3;
++ /* 0x2F0 HI for Primary Display Control Signal */
++ viaVidEng->video1v_addr0 = localVidEng->video1v_addr0;
++ /* 0x2F4 HI for Primary Display Frame Buffer Starting Address */
++ viaVidEng->video1v_addr1 = localVidEng->video1v_addr1;
++ /* 0x2F8 HI for Primary Display Horizontal and Vertical Start */
++ viaVidEng->video1v_addr2 = localVidEng->video1v_addr2;
++ /* 0x2FC HI for Primary Display Center Offset */
++ viaVidEng->video1v_addr3 = localVidEng->video1v_addr3;
+ }
+ viaVidEng->snd_color_key = localVidEng->snd_color_key;
+ viaVidEng->v3alpha_prefifo = localVidEng->v3alpha_prefifo;
@@ -595,18 +627,16 @@ Index: src/via_video.c
+ viaVidEng->video3_CSC2 = localVidEng->video3_CSC2;
+ viaVidEng->compose = localVidEng->compose;
+
- viaVidEng->video1_ctl = pVia->dwV1;
- viaVidEng->video3_ctl = pVia->dwV3;
-- viaVidEng->compose = 0x80000000;
-- viaVidEng->compose = 0x40000000;
--
-+ if (pVia->ChipId != PCI_CHIP_VT3314)
++ viaVidEng->video3_ctl = pVia->dwV3;
++ if (pVia->ChipId != PCI_CHIP_VT3314) {
++ viaVidEng->video1_ctl = pVia->dwV1;
+ viaVidEng->compose = V1_COMMAND_FIRE;
++ }
+ viaVidEng->compose = V3_COMMAND_FIRE;
}
void
-@@ -524,8 +582,8 @@ viaExitVideo(ScrnInfoPtr pScrn)
+@@ -524,8 +599,8 @@ viaExitVideo(ScrnInfoPtr pScrn)
viaVidEng->video1_ctl = 0;
viaVidEng->video3_ctl = 0;
@@ -617,7 +647,7 @@ Index: src/via_video.c
/*
* Free all adaptor info allocated in viaInitVideo.
-@@ -542,15 +600,15 @@ viaExitVideo(ScrnInfoPtr pScrn)
+@@ -542,15 +617,15 @@ viaExitVideo(ScrnInfoPtr pScrn)
(viaPortPrivPtr) curAdapt->pPortPrivates->ptr + j,
TRUE);
}
@@ -637,7 +667,7 @@ Index: src/via_video.c
}
void
-@@ -561,7 +619,7 @@ viaInitVideo(ScreenPtr pScreen)
+@@ -561,7 +636,7 @@ viaInitVideo(ScreenPtr pScreen)
XF86VideoAdaptorPtr *adaptors, *newAdaptors;
int num_adaptors, num_new;
@@ -646,7 +676,7 @@ Index: src/via_video.c
allAdaptors = NULL;
newAdaptors = NULL;
-@@ -611,7 +669,7 @@ viaInitVideo(ScreenPtr pScreen)
+@@ -611,7 +686,7 @@ viaInitVideo(ScreenPtr pScreen)
DBG_DD(ErrorF(" via_video.c : num_adaptors : %d\n", num_adaptors));
if (newAdaptors) {
@@ -655,7 +685,7 @@ Index: src/via_video.c
sizeof(XF86VideoAdaptorPtr *));
if (allAdaptors) {
if (num_adaptors)
-@@ -636,194 +694,6 @@ viaInitVideo(ScreenPtr pScreen)
+@@ -636,194 +711,6 @@ viaInitVideo(ScreenPtr pScreen)
}
}
@@ -850,7 +880,7 @@ Index: src/via_video.c
static unsigned
viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
{
-@@ -832,7 +702,7 @@ viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdapt
+@@ -832,7 +719,7 @@ viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdapt
DevUnion *pdevUnion;
int i, j, usedPorts, numPorts;
@@ -859,7 +889,7 @@ Index: src/via_video.c
xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
xvContrast = MAKE_ATOM("XV_CONTRAST");
-@@ -884,7 +754,7 @@ viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdapt
+@@ -884,7 +771,7 @@ viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdapt
viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
viaAdaptPtr[i]->PutImage = viaPutImage;
@@ -868,7 +898,7 @@ Index: src/via_video.c
viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
for (j = 0; j < numPorts; ++j) {
viaPortPriv[j].dmaBounceBuffer = NULL;
-@@ -931,7 +801,7 @@ viaStopVideo(ScrnInfoPtr pScrn, pointer data, Bool
+@@ -931,7 +818,7 @@ viaStopVideo(ScrnInfoPtr pScrn, pointer data, Bool
if (exit) {
ViaSwovSurfaceDestroy(pScrn, pPriv);
if (pPriv->dmaBounceBuffer)
@@ -877,7 +907,7 @@ Index: src/via_video.c
pPriv->dmaBounceBuffer = 0;
pPriv->dmaBounceStride = 0;
pPriv->dmaBounceLines = 0;
-@@ -1042,6 +912,8 @@ viaGetPortAttribute(ScrnInfoPtr pScrn,
+@@ -1042,6 +929,8 @@ viaGetPortAttribute(ScrnInfoPtr pScrn,
}
} else {
@@ -886,7 +916,7 @@ Index: src/via_video.c
/*return BadMatch */;
}
return Success;
-@@ -1070,6 +942,7 @@ Flip(VIAPtr pVia, viaPortPrivPtr pPriv, int fourcc
+@@ -1070,6 +959,7 @@ Flip(VIAPtr pVia, viaPortPrivPtr pPriv, int fourcc
unsigned long DisplayBufferIndex)
{
unsigned long proReg = 0;
@@ -894,7 +924,7 @@ Index: src/via_video.c
if (pVia->ChipId == PCI_CHIP_VT3259
&& !(pVia->swov.gdwVideoFlagSW & VIDEO_1_INUSE))
-@@ -1081,7 +954,8 @@ Flip(VIAPtr pVia, viaPortPrivPtr pPriv, int fourcc
+@@ -1081,7 +971,8 @@ Flip(VIAPtr pVia, viaPortPrivPtr pPriv, int fourcc
case FOURCC_RV15:
case FOURCC_RV16:
case FOURCC_RV32:
@@ -904,7 +934,7 @@ Index: src/via_video.c
VIDOutD(HQV_SRC_STARTADDR_Y + proReg,
pVia->swov.SWDevice.dwSWPhysicalAddr[DisplayBufferIndex]);
VIDOutD(HQV_CONTROL + proReg,
-@@ -1090,7 +964,8 @@ Flip(VIAPtr pVia, viaPortPrivPtr pPriv, int fourcc
+@@ -1090,7 +981,8 @@ Flip(VIAPtr pVia, viaPortPrivPtr pPriv, int fourcc
break;
case FOURCC_YV12:
default:
@@ -914,7 +944,7 @@ Index: src/via_video.c
VIDOutD(HQV_SRC_STARTADDR_Y + proReg,
pVia->swov.SWDevice.dwSWPhysicalAddr[DisplayBufferIndex]);
if (pVia->VideoEngine == VIDEO_ENGINE_CME) {
-@@ -1174,7 +1049,7 @@ viaDmaBlitImage(VIAPtr pVia,
+@@ -1174,7 +1066,7 @@ viaDmaBlitImage(VIAPtr pVia,
pPort->dmaBounceStride != bounceStride ||
pPort->dmaBounceLines != bounceLines) {
if (pPort->dmaBounceBuffer) {
@@ -923,7 +953,7 @@ Index: src/via_video.c
pPort->dmaBounceBuffer = 0;
}
size = bounceStride * bounceLines + 16;
-@@ -1296,7 +1171,7 @@ viaPutImage(ScrnInfoPtr pScrn,
+@@ -1296,7 +1188,7 @@ viaPutImage(ScrnInfoPtr pScrn,
unsigned long retCode;
# ifdef XV_DEBUG
@@ -932,7 +962,7 @@ Index: src/via_video.c
ErrorF(" via_video.c : FourCC=0x%x width=%d height=%d sync=%d\n", id,
width, height, sync);
ErrorF
-@@ -1405,12 +1280,11 @@ viaPutImage(ScrnInfoPtr pScrn,
+@@ -1405,12 +1297,11 @@ viaPutImage(ScrnInfoPtr pScrn,
lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
@@ -950,7 +980,7 @@ Index: src/via_video.c
/* If use extend FIFO mode */
if (pScrn->currentMode->HDisplay > 1024) {
dwUseExtendedFIFO = 1;
-@@ -1436,7 +1310,8 @@ viaPutImage(ScrnInfoPtr pScrn,
+@@ -1436,7 +1327,8 @@ viaPutImage(ScrnInfoPtr pScrn,
&& (pPriv->old_src_w == src_w) && (pPriv->old_src_h == src_h)
&& (pVia->old_dwUseExtendedFIFO == dwUseExtendedFIFO)
&& (pVia->VideoStatus & VIDEO_SWOV_ON) &&
@@ -960,7 +990,7 @@ Index: src/via_video.c
viaXvError(pScrn, pPriv, xve_none);
return Success;
}
-@@ -1454,16 +1329,18 @@ viaPutImage(ScrnInfoPtr pScrn,
+@@ -1454,16 +1346,18 @@ viaPutImage(ScrnInfoPtr pScrn,
pVia->VideoStatus |= VIDEO_SWOV_ON;
/* BitBlt: Draw the colorkey rectangle */
@@ -983,7 +1013,7 @@ Index: src/via_video.c
}
/*
* Update video overlay
-@@ -1498,6 +1375,7 @@ viaQueryImageAttributes(ScrnInfoPtr pScrn,
+@@ -1498,6 +1392,7 @@ viaQueryImageAttributes(ScrnInfoPtr pScrn,
DBG_DD(ErrorF(" via_video.c : viaQueryImageAttributes : FourCC=0x%x, ",
id));
@@ -993,8 +1023,8 @@ Index: src/via_video.c
return 0;
Index: src/via_lvds.c
===================================================================
---- src/via_lvds.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_lvds.c (.../trunk) (revision 921)
+--- src/via_lvds.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_lvds.c (.../trunk) (revision 977)
@@ -42,7 +42,7 @@
2^13 X 0.0698uSec [1/14.318MHz] = 8192 X 0.0698uSec =572.1uSec
Timer = Counter x 572 uSec
@@ -1006,8 +1036,8 @@ Index: src/via_lvds.c
The meaning of the TD0~TD3 are count of the clock.
Index: src/via_video.h
===================================================================
---- src/via_video.h (.../tags/release_0_2_904) (revision 921)
-+++ src/via_video.h (.../trunk) (revision 921)
+--- src/via_video.h (.../tags/release_0_2_904) (revision 977)
++++ src/via_video.h (.../trunk) (revision 977)
@@ -44,6 +44,10 @@
#define VIDEO_BPP 2
@@ -1030,8 +1060,8 @@ Index: src/via_video.h
CARD32 v3alpha_fetch; /* 2b8 */
Index: src/via_mode.c
===================================================================
---- src/via_mode.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_mode.c (.../trunk) (revision 921)
+--- src/via_mode.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_mode.c (.../trunk) (revision 977)
@@ -308,11 +308,14 @@ ViaDFPDetect(ScrnInfoPtr pScrn)
xf86MonPtr monPtr = NULL;
@@ -1121,8 +1151,8 @@ Index: src/via_mode.c
} else {
Index: src/via_mode.h
===================================================================
---- src/via_mode.h (.../tags/release_0_2_904) (revision 921)
-+++ src/via_mode.h (.../trunk) (revision 921)
+--- src/via_mode.h (.../tags/release_0_2_904) (revision 977)
++++ src/via_mode.h (.../trunk) (revision 977)
@@ -32,8 +32,9 @@
*/
#define VIA_BW_MIN 74000000 /* > 640x480 at 60Hz@32bpp */
@@ -1240,8 +1270,8 @@ Index: src/via_mode.h
{ MODEPREFIX("1280x768"), 81135, 1280, 1328, 1440, 1688, 0, 768, 770, 776, 802, 0, V_PHSYNC | V_NVSYNC, MODESUFFIX },
Index: src/via_memcpy.c
===================================================================
---- src/via_memcpy.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_memcpy.c (.../trunk) (revision 921)
+--- src/via_memcpy.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_memcpy.c (.../trunk) (revision 977)
@@ -581,12 +581,12 @@ viaVidCopyInit(char *copyType, ScreenPtr pScreen)
if (VIAAllocLinear(&tmpFbBuffer, pScrn, alignSize + 31))
@@ -1271,8 +1301,8 @@ Index: src/via_memcpy.c
"Using %s YUV42X copy for %s.\n",
Index: src/via_driver.c
===================================================================
---- src/via_driver.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_driver.c (.../trunk) (revision 921)
+--- src/via_driver.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_driver.c (.../trunk) (revision 977)
@@ -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 ),
@@ -2153,8 +2183,8 @@ Index: src/via_driver.c
Index: src/via_crtc.c
===================================================================
---- src/via_crtc.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_crtc.c (.../trunk) (revision 921)
+--- src/via_crtc.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_crtc.c (.../trunk) (revision 977)
@@ -174,6 +174,7 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayMode
case VIA_P4M900:
case VIA_VX800:
@@ -2230,8 +2260,8 @@ Index: src/via_crtc.c
/* some leftovers */
Index: src/via_swov.c
===================================================================
---- src/via_swov.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_swov.c (.../trunk) (revision 921)
+--- src/via_swov.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_swov.c (.../trunk) (revision 977)
@@ -65,6 +65,31 @@
#define IN_VIDEO_DISPLAY (*((unsigned long volatile *)(pVia->VidMapBase+V_FLAGS))&VBI_STATUS)
#define VIA_FIRETIMEOUT 40000
@@ -2785,8 +2815,8 @@ Index: src/via_swov.c
Index: src/via_driver.h
===================================================================
---- src/via_driver.h (.../tags/release_0_2_904) (revision 921)
-+++ src/via_driver.h (.../trunk) (revision 921)
+--- src/via_driver.h (.../tags/release_0_2_904) (revision 977)
++++ src/via_driver.h (.../trunk) (revision 977)
@@ -127,9 +127,10 @@ typedef struct {
CARD8 SR27, SR28, SR29, SR2A,SR2B,SR2C,SR2D,SR2E;
CARD8 SR2F, SR30, SR31, SR32,SR33,SR34,SR40,SR41;
@@ -2847,8 +2877,8 @@ Index: src/via_driver.h
Index: src/via_bios.h
===================================================================
---- src/via_bios.h (.../tags/release_0_2_904) (revision 921)
-+++ src/via_bios.h (.../trunk) (revision 921)
+--- src/via_bios.h (.../tags/release_0_2_904) (revision 977)
++++ src/via_bios.h (.../trunk) (revision 977)
@@ -82,6 +82,11 @@
#define VIA_DEVICE_TV 0x04
#define VIA_DEVICE_DFP 0x08
@@ -2874,8 +2904,8 @@ Index: src/via_bios.h
/* Digital Output Bus Width */
Index: src/via_swov.h
===================================================================
---- src/via_swov.h (.../tags/release_0_2_904) (revision 921)
-+++ src/via_swov.h (.../trunk) (revision 921)
+--- src/via_swov.h (.../tags/release_0_2_904) (revision 977)
++++ src/via_swov.h (.../trunk) (revision 977)
@@ -53,7 +53,7 @@ typedef struct __VIAHWDiff
{
unsigned long dwThreeHQVBuffer; /* Use Three HQV Buffers */
@@ -2896,8 +2926,8 @@ Index: src/via_swov.h
void VIAVidHWDiffInit(ScrnInfoPtr pScrn);
Index: src/via_bandwidth.c
===================================================================
---- src/via_bandwidth.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_bandwidth.c (.../trunk) (revision 921)
+--- src/via_bandwidth.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_bandwidth.c (.../trunk) (revision 977)
@@ -194,6 +194,7 @@ ViaSetPrimaryFIFO(ScrnInfoPtr pScrn, DisplayModePt
else
ViaSeqMask(hwp, 0x22, 0x00, 0x1F); /* 128/4 = overflow = 0 */
@@ -3092,8 +3122,8 @@ Index: src/via_bandwidth.c
"Chipset %d not implemented\n", pVia->Chipset);
Index: src/via_accel.c
===================================================================
---- src/via_accel.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_accel.c (.../trunk) (revision 921)
+--- src/via_accel.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_accel.c (.../trunk) (revision 977)
@@ -196,6 +196,7 @@ viaFlushPCI(ViaCommandBuffer * buf)
switch (pVia->Chipset) {
case VIA_VX800:
@@ -3436,7 +3466,21 @@ Index: src/via_accel.c
xaaptr->ImageWriteRange = VIA_MMIO_BLTSIZE;
else
xaaptr->ImageWriteRange = (64 * 1024);
-@@ -2344,7 +2384,7 @@ viaInitExa(ScreenPtr pScreen)
+@@ -2162,6 +2202,13 @@ viaExaPrepareComposite(int op, PicturePtr pSrcPict
+ Bool isAGP;
+ unsigned long offset;
+
++ /* Workaround: EXA crash with new libcairo2 on a VIA VX800 (#298) */
++ /* TODO Add real source only pictures */
++ if (!pSrc) {
++ ErrorF("pSrc is NULL\n");
++ return FALSE;
++ }
++
+ v3d->setDestination(v3d, exaGetPixmapOffset(pDst),
+ exaGetPixmapPitch(pDst), pDstPicture->format);
+ v3d->setCompositeOperator(v3d, op);
+@@ -2344,7 +2391,7 @@ viaInitExa(ScreenPtr pScreen)
}
if (!exaDriverInit(pScreen, pExa)) {
@@ -3445,7 +3489,7 @@ Index: src/via_accel.c
return NULL;
}
-@@ -2354,7 +2394,7 @@ viaInitExa(ScreenPtr pScreen)
+@@ -2354,7 +2401,7 @@ viaInitExa(ScreenPtr pScreen)
/*
@@ -3454,7 +3498,7 @@ Index: src/via_accel.c
* and initializes engines and acceleration method.
*/
Bool
-@@ -2542,7 +2582,7 @@ viaExitAccel(ScreenPtr pScreen)
+@@ -2542,7 +2589,7 @@ viaExitAccel(ScreenPtr pScreen)
}
}
if (pVia->dBounce)
@@ -3463,7 +3507,7 @@ Index: src/via_accel.c
#endif /* XF86DRI */
if (pVia->scratchAddr) {
exaOffscreenFree(pScreen, pVia->scratchFBBuffer);
-@@ -2551,7 +2591,7 @@ viaExitAccel(ScreenPtr pScreen)
+@@ -2551,7 +2598,7 @@ viaExitAccel(ScreenPtr pScreen)
if (pVia->exaDriverPtr) {
exaDriverFini(pScreen);
}
@@ -3472,7 +3516,7 @@ Index: src/via_accel.c
pVia->exaDriverPtr = NULL;
return;
}
-@@ -2577,7 +2617,7 @@ viaFinishInitAccel(ScreenPtr pScreen)
+@@ -2577,7 +2624,7 @@ viaFinishInitAccel(ScreenPtr pScreen)
if (pVia->directRenderingEnabled && pVia->useEXA) {
@@ -3483,8 +3527,8 @@ Index: src/via_accel.c
Index: src/via_vt162x.c
===================================================================
---- src/via_vt162x.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_vt162x.c (.../trunk) (revision 921)
+--- src/via_vt162x.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_vt162x.c (.../trunk) (revision 977)
@@ -41,30 +41,42 @@ ViaSetTVClockSource(ScrnInfoPtr pScrn)
VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
vgaHWPtr hwp = VGAHWPTR(pScrn);
@@ -3547,8 +3591,8 @@ Index: src/via_vt162x.c
static void
Index: src/via_vbe.c
===================================================================
---- src/via_vbe.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_vbe.c (.../trunk) (revision 921)
+--- src/via_vbe.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_vbe.c (.../trunk) (revision 977)
@@ -230,7 +230,7 @@ ViaVbeSetMode(ScrnInfoPtr pScrn, DisplayModePtr pM
/* Some cards do not like setting the clock. */
xf86ErrorF("...but worked OK without customized "
@@ -3569,8 +3613,8 @@ Index: src/via_vbe.c
}
Index: src/via_xvmc.c
===================================================================
---- src/via_xvmc.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_xvmc.c (.../trunk) (revision 921)
+--- src/via_xvmc.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_xvmc.c (.../trunk) (revision 977)
@@ -151,7 +151,7 @@ cleanupViaXvMC(ViaXvMCPtr vXvMC, XF86VideoAdaptorP
for (i = 0; i < VIA_XVMC_MAX_CONTEXTS; ++i) {
vXvMC->contexts[i] = 0;
@@ -3755,8 +3799,8 @@ Index: src/via_xvmc.c
for (i = 0; i < VIA_NUM_XVMC_ATTRIBUTES; ++i) {
Index: src/via_cursor.c
===================================================================
---- src/via_cursor.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_cursor.c (.../trunk) (revision 921)
+--- src/via_cursor.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_cursor.c (.../trunk) (revision 977)
@@ -98,6 +98,7 @@ viaHWCursorInit(ScreenPtr pScreen)
case VIA_P4M900:
case VIA_VX800:
@@ -3983,8 +4027,8 @@ Index: src/via_cursor.c
Index: src/via_i2c.c
===================================================================
---- src/via_i2c.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_i2c.c (.../trunk) (revision 921)
+--- src/via_i2c.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_i2c.c (.../trunk) (revision 977)
@@ -365,9 +365,18 @@ ViaI2CInit(ScrnInfoPtr pScrn)
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaI2CInit\n"));
@@ -4009,8 +4053,8 @@ Index: src/via_i2c.c
if (pVia->I2CScan) {
Index: src/via_dri.c
===================================================================
---- src/via_dri.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_dri.c (.../trunk) (revision 921)
+--- src/via_dri.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_dri.c (.../trunk) (revision 977)
@@ -187,7 +187,7 @@ VIADRIRingBufferInit(ScrnInfoPtr pScrn)
return FALSE;
@@ -4132,8 +4176,8 @@ Index: src/via_dri.c
}
Index: src/via.h
===================================================================
---- src/via.h (.../tags/release_0_2_904) (revision 921)
-+++ src/via.h (.../trunk) (revision 921)
+--- src/via.h (.../tags/release_0_2_904) (revision 977)
++++ src/via.h (.../trunk) (revision 977)
@@ -34,7 +34,7 @@
/* Video Engines */
@@ -4213,8 +4257,8 @@ Index: src/via.h
#define CHROMA_KEY_HIGH 0x00FFFFFF
Index: man/openchrome.man
===================================================================
---- man/openchrome.man (.../tags/release_0_2_904) (revision 921)
-+++ man/openchrome.man (.../trunk) (revision 921)
+--- man/openchrome.man (.../tags/release_0_2_904) (revision 977)
++++ man/openchrome.man (.../trunk) (revision 977)
@@ -22,7 +22,7 @@ The
.B openchrome
driver supports the following chipsets: CLE266, KM400/KN400/KM400A/P4M800,
@@ -4298,8 +4342,8 @@ Index: man/openchrome.man
Authors include: ...
Index: src/via_dga.c
===================================================================
---- src/via_dga.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_dga.c (.../trunk) (revision 921)
+--- src/via_dga.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_dga.c (.../trunk) (revision 977)
@@ -89,16 +89,16 @@ VIASetupDGAMode(
otherPitch = secondPitch ? secondPitch : pMode->HDisplay;
@@ -4322,8 +4366,8 @@ Index: src/via_dga.c
Index: src/via_id.c
===================================================================
---- src/via_id.c (.../tags/release_0_2_904) (revision 921)
-+++ src/via_id.c (.../trunk) (revision 921)
+--- src/via_id.c (.../tags/release_0_2_904) (revision 977)
++++ src/via_id.c (.../trunk) (revision 977)
@@ -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" */
@@ -4372,7 +4416,7 @@ Index: src/via_id.c
{"MSI K9VGM-V", VIA_K8M890, 0x1462, 0x7253, VIA_DEVICE_CRT},
{"Averatec 226x", VIA_K8M890, 0x14FF, 0xA002, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Fujitsu/Siemens Amilo La 1703", VIA_K8M890, 0x1734, 0x10D9, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-@@ -183,12 +189,14 @@ static struct ViaCardIdStruct ViaCardId[] = {
+@@ -183,12 +189,15 @@ 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},
@@ -4381,6 +4425,7 @@ Index: src/via_id.c
{"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},
++ {"MSI PM9M-V", VIA_P4M900, 0x1462, 0x7364, VIA_DEVICE_CRT},
{"MSI P4M900M3-L", VIA_P4M900, 0x1462, 0x7387, VIA_DEVICE_CRT},
{"Twinhead H12V", VIA_P4M900, 0x14FF, 0xA00F, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+ {"Twinhead K15V", VIA_P4M900, 0x14FF, 0xA012, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
@@ -4388,7 +4433,7 @@ Index: src/via_id.c
{"Everex NC1501/NC1503", VIA_P4M900, 0x1509, 0x1E30, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Clevo M660SE", VIA_P4M900, 0x1558, 0x0664, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Clevo M660SR", VIA_P4M900, 0x1558, 0x0669, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-@@ -224,14 +232,23 @@ static struct ViaCardIdStruct ViaCardId[] = {
+@@ -224,14 +233,23 @@ static struct ViaCardIdStruct ViaCardId[] = {
/*** VX800 ***/
{"VIA Epia M700", VIA_VX800, 0x1106, 0x1122, VIA_DEVICE_CRT},
@@ -4414,8 +4459,8 @@ Index: src/via_id.c
};
Index: src/via_timing.h
===================================================================
---- src/via_timing.h (.../tags/release_0_2_904) (revision 921)
-+++ src/via_timing.h (.../trunk) (revision 921)
+--- src/via_timing.h (.../tags/release_0_2_904) (revision 977)
++++ src/via_timing.h (.../trunk) (revision 977)
@@ -40,7 +40,7 @@
#define TIMING_CVT_WARN_REFRESH_RATE_NOT_RB 1 << 3
More information about the scm-commits
mailing list