openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-08 10:19:00 +00:00
Code Issues Projects Releases Wiki Activity

update to svn revision 753. This includes a few bug fixes that

Browse Source 
make EXA work on my Chrome9 HC3 IGP. ok oga@
This commit is contained in:
matthieu
2009-06-27 10:11:47 +00:00
parent 9e42493983
commit ffd83bca19
4 changed files with 5 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
driver/xf86-video-openchrome/src/via_accel.c
View File

@@ -2060,7 +2060,7 @@ viaExaCheckComposite(int op, PicturePtr pSrcPicture,
pMaskPicture->pDrawable->height < VIA_MIN_COMPOSITE)
return FALSE;
if (pMaskPicture->repeat != RepeatNormal)
if (pMaskPicture && pMaskPicture->repeat != RepeatNormal)
return FALSE;
if (pMaskPicture && pMaskPicture->componentAlpha) {

53
driver/xf86-video-openchrome/src/via_regs.h
View File

@@ -113,42 +113,6 @@
#define VIA_REG_CURSOR_FG 0x2E0
/* These regs move about on diffrent hw */
#define VIA_REG_HI_CONTROL1 VIA_REG_ALPHA_CONTROL
#define VIA_REG_HI_BASE1 VIA_REG_ALPHA_BASE
#define VIA_REG_HI_POS1 VIA_REG_ALPHA_POS
#define VIA_REG_HI_OFFSET1 VIA_REG_ALPHA_OFFSET
#define VIA_REG_HI_FIFO1 VIA_REG_ALPHA_FIFO
#define VIA_REG_HI_TRANSKEY1 VIA_REG_ALPHA_TRANSKEY
/* Note that Hardware Icon and Alpha Window overlap */
#define VIA_REG_ALPHA_CONTROL 0x260
#define VIA_REG_ALPHA_BASE 0x224
#define VIA_REG_ALPHA_POS 0x208
#define VIA_REG_ALPHA_OFFSET 0x20C
#define VIA_REG_ALPHA_PREFIFO 0x268
#define VIA_REG_ALPHA_FIFO 0x278
#define VIA_REG_ALPHA_TRANSKEY 0x270
/* These regs move about on diffrent hw */
#define VIA_REG_HI_CONTROL1 VIA_REG_ALPHA_CONTROL
#define VIA_REG_HI_BASE1 VIA_REG_ALPHA_BASE
#define VIA_REG_HI_POS1 VIA_REG_ALPHA_POS
#define VIA_REG_HI_OFFSET1 VIA_REG_ALPHA_OFFSET
#define VIA_REG_HI_FIFO1 VIA_REG_ALPHA_FIFO
#define VIA_REG_HI_TRANSKEY1 VIA_REG_ALPHA_TRANSKEY
/* Note that Hardware Icon and Alpha Window overlap */
#define VIA_REG_ALPHA_CONTROL 0x260
#define VIA_REG_ALPHA_BASE 0x224
#define VIA_REG_ALPHA_POS 0x208
#define VIA_REG_ALPHA_OFFSET 0x20C
#define VIA_REG_ALPHA_PREFIFO 0x268
#define VIA_REG_ALPHA_FIFO 0x278
#define VIA_REG_ALPHA_TRANSKEY 0x270
/* These regs move about on diffrent hw */
#define VIA_REG_HI_CONTROL1 VIA_REG_ALPHA_CONTROL
#define VIA_REG_HI_BASE1 VIA_REG_ALPHA_BASE
@@ -174,23 +138,6 @@
#define VIA_REG_HI_FIFO0 0x2E8
#define VIA_REG_HI_TRANSKEY0 0x2EC
/* These regs move about on diffrent hw */
#define VIA_REG_HI_CONTROL1 VIA_REG_ALPHA_CONTROL
#define VIA_REG_HI_BASE1 VIA_REG_ALPHA_BASE
#define VIA_REG_HI_POS1 VIA_REG_ALPHA_POS
#define VIA_REG_HI_OFFSET1 VIA_REG_ALPHA_OFFSET
#define VIA_REG_HI_FIFO1 VIA_REG_ALPHA_FIFO
#define VIA_REG_HI_TRANSKEY1 VIA_REG_ALPHA_TRANSKEY
/* Note that Hardware Icon and Alpha Window overlap */
#define VIA_REG_ALPHA_CONTROL 0x260
#define VIA_REG_ALPHA_BASE 0x224
#define VIA_REG_ALPHA_POS 0x208
#define VIA_REG_ALPHA_OFFSET 0x20C
#define VIA_REG_ALPHA_PREFIFO 0x268
#define VIA_REG_ALPHA_FIFO 0x278
#define VIA_REG_ALPHA_TRANSKEY 0x270
/*CN400 and older Hardware Icon engine register*/
#define VIA_REG_HI_POSSTART 0x208
#define VIA_REG_HI_CENTEROFFSET 0x20C

1
driver/xf86-video-openchrome/src/via_video.c
View File

@@ -599,6 +599,7 @@ viaInitVideo(ScreenPtr pScreen)
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"[Xv] Unsupported Chipset. X video functionality disabled.\n");
num_adaptors = 0;
memset(viaAdaptPtr, 0, sizeof(viaAdaptPtr));
}
DBG_DD(ErrorF(" via_video.c : num_adaptors : %d\n", num_adaptors));

3
driver/xf86-video-openchrome/src/via_xvmc.c
View File

@@ -412,6 +412,9 @@ ViaCleanupXVMC(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr * XvAdaptors,
cleanupViaXvMC(vXvMC, XvAdaptors, XvAdaptorCount);
}
for (i = 0; i < XvAdaptorCount; ++i) {
if (!XvAdaptors[i])
continue;
for (j = 0; j < XvAdaptors[i]->nPorts; ++j) {
viaPortPrivPtr pPriv = XvAdaptors[i]->pPortPrivates[j].ptr;