xserver: Branch 'master' - 3 commits
Daniel Stone
daniels at kemper.freedesktop.org
Mon Jan 5 07:44:16 PST 2009
hw/xfree86/common/xf86xv.c | 4 ++++
hw/xfree86/common/xf86xv.h | 3 +++
hw/xfree86/common/xf86xvpriv.h | 1 +
hw/xfree86/fbdevhw/fbdevhw.c | 8 ++++++++
hw/xfree86/fbdevhw/fbdevhw.h | 2 ++
randr/randrstr.h | 2 ++
6 files changed, 20 insertions(+)
New commits:
commit e351d10773742d1570e1111976b7c8b6adda5ae6
Author: Daniel Stone <daniel at fooishbar.org>
Date: Mon Jan 5 17:41:38 2009 +0200
RandR: Only export Xinerama symbols when building Xinerama support
Otherwise compilation fails due to sdksyms.
Signed-off-by: Daniel Stone <daniel at fooishbar.org>
diff --git a/randr/randrstr.h b/randr/randrstr.h
index be596d4..9e7bbf3 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -889,8 +889,10 @@ extern _X_EXPORT int
ProcRRDeleteOutputProperty (ClientPtr client);
/* rrxinerama.c */
+#ifdef XINERAMA
extern _X_EXPORT void
RRXineramaExtensionInit(void);
+#endif
#endif /* _RANDRSTR_H_ */
commit 3387cbb7c13636eb62b22640d28df7011c2268f0
Author: Daniel Stone <daniel at fooishbar.org>
Date: Mon Jan 5 11:25:57 2009 +0200
XFree86: Xv: Add ClipNotify helper
Add a ClipNotify helper that lets the driver know about changes in the
clipping of an Xv backing drawable.
Signed-off-by: Daniel Stone <daniel at fooishbar.org>
diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index 85b13d3..abbe033 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -1123,6 +1123,10 @@ xf86XVClipNotify(WindowPtr pWin, int dx, int dy)
pPriv->pCompositeClip = NULL;
+ if (pPriv->AdaptorRec->ClipNotify)
+ (*pPriv->AdaptorRec->ClipNotify)(pPriv->pScrn, pPriv->DevPriv.ptr,
+ pWin, dx, dy);
+
/* Stop everything except images, but stop them too if the
window isn't visible. But we only remove the images. */
diff --git a/hw/xfree86/common/xf86xv.h b/hw/xfree86/common/xf86xv.h
index e98c423..c3db6cc 100644
--- a/hw/xfree86/common/xf86xv.h
+++ b/hw/xfree86/common/xf86xv.h
@@ -112,6 +112,8 @@ typedef int (* ReputImageFuncPtr)( ScrnInfoPtr pScrn, short drw_x, short drw_y,
typedef int (*QueryImageAttributesFuncPtr)(ScrnInfoPtr pScrn,
int image, unsigned short *width, unsigned short *height,
int *pitches, int *offsets);
+typedef void (*ClipNotifyFuncPtr)(ScrnInfoPtr pScrn, pointer data,
+ WindowPtr window, int dx, int dy);
typedef enum {
XV_OFF,
@@ -165,6 +167,7 @@ typedef struct {
PutImageFuncPtr PutImage;
ReputImageFuncPtr ReputImage;
QueryImageAttributesFuncPtr QueryImageAttributes;
+ ClipNotifyFuncPtr ClipNotify;
} XF86VideoAdaptorRec, *XF86VideoAdaptorPtr;
typedef struct {
diff --git a/hw/xfree86/common/xf86xvpriv.h b/hw/xfree86/common/xf86xvpriv.h
index 761fc3a..7623d29 100644
--- a/hw/xfree86/common/xf86xvpriv.h
+++ b/hw/xfree86/common/xf86xvpriv.h
@@ -59,6 +59,7 @@ typedef struct {
PutImageFuncPtr PutImage;
ReputImageFuncPtr ReputImage;
QueryImageAttributesFuncPtr QueryImageAttributes;
+ ClipNotifyFuncPtr ClipNotify;
} XvAdaptorRecPrivate, *XvAdaptorRecPrivatePtr;
typedef struct {
commit 55c4ec0a1ef78481b4d82153c19c20fbf88f1624
Author: Daniel Stone <daniel at fooishbar.org>
Date: Mon Jan 5 11:24:24 2009 +0200
XFree86: fbdevhw: Add helper function to get fd
Most devices need to do custom weird ioctls, so let them know what the
fd is.
Signed-off-by: Daniel Stone <daniel at fooishbar.org>
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index 5269277..495d88b 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -152,6 +152,14 @@ fbdevHWFreeRec(ScrnInfoPtr pScrn)
FBDEVHWPTRLVAL(pScrn) = NULL;
}
+int
+fbdevHWGetFD(ScrnInfoPtr pScrn)
+{
+ fbdevHWPtr fPtr = fbdevHWGetRec(pScrn);
+
+ return fPtr->fd;
+}
+
/* -------------------------------------------------------------------- */
/* some helpers for printing debug informations */
diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h
index 41c3e33..bc46b9c 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.h
+++ b/hw/xfree86/fbdevhw/fbdevhw.h
@@ -16,6 +16,8 @@
extern _X_EXPORT Bool fbdevHWGetRec(ScrnInfoPtr pScrn);
extern _X_EXPORT void fbdevHWFreeRec(ScrnInfoPtr pScrn);
+extern _X_EXPORT int fbdevHWGetFD(ScrnInfoPtr pScrn);
+
extern _X_EXPORT Bool fbdevHWProbe(struct pci_device * pPci, char *device, char **namep);
extern _X_EXPORT Bool fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device);
More information about the xorg-commit
mailing list