xf86-video-intel: Branch 'modesetting' - 3 commits - src/i830_exa.c src/i830_exa_render.c src/i830.h src/i830_memory.c src/i915_exa_render.c src/i965_exa_render.c
Keith Packard
keithp at kemper.freedesktop.org
Mon Jan 8 22:37:39 EET 2007
src/i830.h | 31 ++++++++++++++++++++++++++-----
src/i830_exa.c | 12 ------------
src/i830_exa_render.c | 10 ----------
src/i830_memory.c | 10 ++++++----
src/i915_exa_render.c | 9 ---------
src/i965_exa_render.c | 13 -------------
6 files changed, 32 insertions(+), 53 deletions(-)
New commits:
diff-tree da6a00f787e4d13e6b75768c1976f1c44ae5bf72 (from 66546d8a8006e1c828e18ccab850214fd8d56b63)
Author: Keith Packard <keithp at neko.keithp.com>
Date: Mon Jan 8 12:36:54 2007 -0800
Move EXA function declarations from source to header.
Several new global functions were not put into the header file leading to
potential mismatches between declaration and definition.
diff --git a/src/i830.h b/src/i830.h
index dc0d768..95bea2f 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -503,11 +503,6 @@ typedef struct _I830Rec {
#define I830_SELECT_BACK 1
#define I830_SELECT_DEPTH 2
-#ifdef I830_USE_EXA
-extern const int I830PatternROP[16];
-extern const int I830CopyROP[16];
-#endif
-
/* I830 specific functions */
extern int I830WaitLpRing(ScrnInfoPtr pScrn, int n, int timeout_millis);
extern void I830SetPIOAccess(I830Ptr pI830);
@@ -620,6 +615,32 @@ DisplayModePtr i830_ddc_get_modes(xf86Ou
/* i830_tv.c */
void i830_tv_init(ScrnInfoPtr pScrn);
+#ifdef I830_USE_EXA
+extern Bool I830EXACheckComposite(int, PicturePtr, PicturePtr, PicturePtr);
+extern Bool I830EXAPrepareComposite(int, PicturePtr, PicturePtr, PicturePtr,
+ PixmapPtr, PixmapPtr, PixmapPtr);
+extern Bool I915EXACheckComposite(int, PicturePtr, PicturePtr, PicturePtr);
+extern Bool I915EXAPrepareComposite(int, PicturePtr, PicturePtr, PicturePtr,
+ PixmapPtr, PixmapPtr, PixmapPtr);
+
+extern Bool I965EXACheckComposite(int, PicturePtr, PicturePtr, PicturePtr);
+extern Bool I965EXAPrepareComposite(int, PicturePtr, PicturePtr, PicturePtr,
+ PixmapPtr, PixmapPtr, PixmapPtr);
+extern void I965EXAComposite(PixmapPtr pDst, int srcX, int srcY, int maskX,
+ int maskY, int dstX, int dstY, int width, int height);
+
+extern Bool
+I830EXACheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
+ PicturePtr pDstPicture);
+
+extern Bool
+I830EXAPrepareComposite(int op, PicturePtr pSrcPicture,
+ PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst);
+
+extern const int I830PatternROP[16];
+extern const int I830CopyROP[16];
+#endif
/* Flags for memory allocation function */
#define FROM_ANYWHERE 0x00000000
#define FROM_POOL_ONLY 0x00000001
diff --git a/src/i830_exa.c b/src/i830_exa.c
index 02ac903..4944e40 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -109,18 +109,6 @@ union intfloat {
OUT_RING(tmp.ui); \
} while(0)
-extern Bool I830EXACheckComposite(int, PicturePtr, PicturePtr, PicturePtr);
-extern Bool I830EXAPrepareComposite(int, PicturePtr, PicturePtr, PicturePtr,
- PixmapPtr, PixmapPtr, PixmapPtr);
-extern Bool I915EXACheckComposite(int, PicturePtr, PicturePtr, PicturePtr);
-extern Bool I915EXAPrepareComposite(int, PicturePtr, PicturePtr, PicturePtr,
- PixmapPtr, PixmapPtr, PixmapPtr);
-
-extern Bool I965EXACheckComposite(int, PicturePtr, PicturePtr, PicturePtr);
-extern Bool I965EXAPrepareComposite(int, PicturePtr, PicturePtr, PicturePtr,
- PixmapPtr, PixmapPtr, PixmapPtr);
-extern void I965EXAComposite(PixmapPtr pDst, int srcX, int srcY, int maskX,
- int maskY, int dstX, int dstY, int width, int height);
/**
* I830EXASync - wait for a command to finish
* @pScreen: current screen
diff --git a/src/i830_exa_render.c b/src/i830_exa_render.c
index 5e202c8..ae4f95f 100644
--- a/src/i830_exa_render.c
+++ b/src/i830_exa_render.c
@@ -63,16 +63,6 @@ struct formatinfo {
CARD32 card_fmt;
};
-extern Bool
-I830EXACheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
- PicturePtr pDstPicture);
-
-extern Bool
-I830EXAPrepareComposite(int op, PicturePtr pSrcPicture,
- PicturePtr pMaskPicture, PicturePtr pDstPicture,
- PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst);
-
-
#define TB0C_LAST_STAGE (1 << 31)
#define TB0C_RESULT_SCALE_1X (0 << 29)
#define TB0C_RESULT_SCALE_2X (1 << 29)
diff --git a/src/i915_exa_render.c b/src/i915_exa_render.c
index 640ebd9..46533b3 100644
--- a/src/i915_exa_render.c
+++ b/src/i915_exa_render.c
@@ -64,15 +64,6 @@ struct blendinfo {
CARD32 dst_blend;
};
-extern Bool
-I915EXACheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
- PicturePtr pDstPicture);
-
-extern Bool
-I915EXAPrepareComposite(int op, PicturePtr pSrcPicture,
- PicturePtr pMaskPicture, PicturePtr pDstPicture,
- PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst);
-
static struct blendinfo I915BlendOp[] = {
/* Clear */
{0, 0, BLENDFACT_ZERO, BLENDFACT_ZERO},
diff --git a/src/i965_exa_render.c b/src/i965_exa_render.c
index 89581e9..68293cd 100644
--- a/src/i965_exa_render.c
+++ b/src/i965_exa_render.c
@@ -55,19 +55,6 @@ do { \
} while(0)
#endif
-extern Bool
-I965EXACheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
- PicturePtr pDstPicture);
-
-extern Bool
-I965EXAPrepareComposite(int op, PicturePtr pSrcPicture,
- PicturePtr pMaskPicture, PicturePtr pDstPicture,
- PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst);
-
-extern void
-I965EXAComposite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY,
- int dstX, int dstY, int width, int height);
-
static void I965GetBlendCntl(int op, PicturePtr pMask, CARD32 dst_format,
CARD32 *sblend, CARD32 *dblend);
diff-tree 66546d8a8006e1c828e18ccab850214fd8d56b63 (from parents)
Merge: 0fd2752f199928f846fe03c9087f7b6d48cc28d9 40af0ee6ba4ab7596fbc7fcc3ad04d109746ca6f
Author: Keith Packard <keithp at neko.keithp.com>
Date: Mon Jan 8 10:14:24 2007 -0800
Merge branch 'modesetting-origin' into modesetting
diff-tree 0fd2752f199928f846fe03c9087f7b6d48cc28d9 (from 736d82a6b43f174cb95b425faacd4b0b889916fa)
Author: Wang Zhenyu <zhenyu.z.wang at intel.com>
Date: Thu Jan 4 14:35:55 2007 +0800
minor fix on last exa mem binding commit
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 3a3836c..af86688 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -2044,10 +2044,12 @@ I830UnbindAGPMemory(ScrnInfoPtr pScrn)
}
#endif
#ifdef I830_USE_EXA
- if (!UnbindMemRange(pScrn, &(pI830->Offscreen)))
- return FALSE;
- if (IS_I965G(pI830) && !UnbindMemRange(pScrn, &(pI830->EXAStateMem)))
- return FALSE;
+ if (pI830->useEXA) {
+ if (!UnbindMemRange(pScrn, &(pI830->Offscreen)))
+ return FALSE;
+ if (IS_I965G(pI830) && !UnbindMemRange(pScrn, &(pI830->EXAStateMem)))
+ return FALSE;
+ }
#endif
if (!xf86ReleaseGART(pScrn->scrnIndex))
return FALSE;
More information about the xorg-commit
mailing list