Module Name: xsrc
Committed By: mrg
Date: Tue Nov 23 09:01:19 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i810_driver.c i830_dri.c
i830_driver.c i830_video.c
Log Message:
#if 0 the code that tries to:
- call xf86RegisterResources()
- use ResUnusedOpr, ResDisableOpr or ResNone
- use racMemFlags member of ScrnInfoPtr{}
- set/use CreateBuffers/DestroyBuffers members of DRI2InfoRec{}
- one of the two calls to i830_fill_colorkey().
for the other call to i830_fill_colorkey(), update it based upon code
seen in xf86-video-intel 2.11.0, and use xf86XVFillKeyHelperDrawable().
i can't see how to get a DrawablePtr for the other call, though.
XXX: i'm entirely unsure this will work with xorg-server 1.9.2. there's
XXX: a decent chance that everything but i830-based will work, and that
XXX: even i830 will work ok, but it really needs to be tested.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c \
xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c \
xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_dri.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c:1.2 Tue Nov 23 08:53:04 2010
+++ xsrc/external/mit/xf86-video-intel/dist/src/i810_driver.c Tue Nov 23 09:01:18 2010
@@ -876,9 +876,11 @@
pI810->PciInfo->func);
#endif
+#if 0
if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone))
return FALSE;
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
+#endif
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
@@ -1318,8 +1320,10 @@
/* We won't be using the VGA access after the probe */
I810SetMMIOAccess(pI810);
+#if 0
xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
+#endif
return TRUE;
}
Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.2 Tue Nov 23 08:53:04 2010
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c Tue Nov 23 09:01:19 2010
@@ -1852,12 +1852,14 @@
pI830->PciInfo->func);
#endif
+#if 0
if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) {
PreInitCleanup(pScrn);
return FALSE;
}
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
+#endif
pScrn->monitor = pScrn->confScreen->monitor;
pScrn->progClock = TRUE;
pScrn->rgbBits = 8;
@@ -1986,8 +1988,10 @@
/* We won't be using the VGA access after the probe. */
I830SetMMIOAccess(pI830);
+#if 0
xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr);
xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr);
+#endif
}
#if defined(XF86DRI)
Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c:1.2 Tue Nov 23 08:53:04 2010
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_video.c Tue Nov 23 09:01:19 2010
@@ -2161,6 +2161,7 @@
return ret;
}
+#if 0
static void
i830_fill_colorkey (ScreenPtr pScreen, uint32_t key, RegionPtr clipboxes)
{
@@ -2194,6 +2195,7 @@
xfree (rects);
FreeScratchGC (gc);
}
+#endif
/*
* The source rectangle of the video is defined by (src_x, src_y, src_w, src_h).
@@ -2505,7 +2507,13 @@
/* update cliplist */
if (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
+#if 0
i830_fill_colorkey (pScreen, pPriv->colorKey, clipBoxes);
+#else
+ xf86XVFillKeyHelperDrawable(pDraw,
+ pPriv->colorKey,
+ clipBoxes);
+#endif
}
} else {
Bool sync = TRUE;
@@ -2864,7 +2872,15 @@
surface->pitches[0], x1, y1, x2, y2, &dstBox,
src_w, src_h, drw_w, drw_h);
+#if 0
+#if 0
i830_fill_colorkey (pScreen, pI830Priv->colorKey, clipBoxes);
+#else
+ xf86XVFillKeyHelperDrawable(drawable,
+ pI830Priv->colorKey,
+ clipBoxes);
+#endif
+#endif
pPriv->isOn = TRUE;
/* we've prempted the XvImage stream so set its free timer */
Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_dri.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_dri.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_dri.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_dri.c:1.1.1.2 Tue Jun 9 02:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_dri.c Tue Nov 23 09:01:18 2010
@@ -1531,6 +1531,7 @@
PixmapPtr pPixmap;
} I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
+#if 0
static DRI2BufferPtr
I830DRI2CreateBuffers(DrawablePtr pDraw, unsigned int *attachments, int count)
{
@@ -1632,6 +1633,7 @@
xfree(buffers);
}
}
+#endif
static void
I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
@@ -1732,8 +1734,10 @@
info.deviceName = p;
info.version = 1;
+#if 0
info.CreateBuffers = I830DRI2CreateBuffers;
info.DestroyBuffers = I830DRI2DestroyBuffers;
+#endif
info.CopyRegion = I830DRI2CopyRegion;
pI830->drmSubFD = info.fd;
