diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-09 08:17:19 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-09 08:17:19 +0200 |
| commit | 98fa64178af8ad608e19391053b40b0772466c64 (patch) | |
| tree | 841e3eebe0277bdf98441dd45224c039e069d3b8 /xorg-server/hw/xfree86/common/xf86.h | |
| parent | 405ae9defaaa03d4d305b6264a744107c3dd460d (diff) | |
| parent | c29d91cfd8df084f16d0d2dfa82c3a86f7719a73 (diff) | |
| download | vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.tar.gz vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.tar.bz2 vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/include/misc.h
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86.h')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86.h b/xorg-server/hw/xfree86/common/xf86.h index 129660d81..61169857f 100644 --- a/xorg-server/hw/xfree86/common/xf86.h +++ b/xorg-server/hw/xfree86/common/xf86.h @@ -71,6 +71,11 @@ extern _X_EXPORT Bool fbSlotClaimed; #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) extern _X_EXPORT Bool sbusSlotClaimed; #endif + +#if defined(XSERVER_PLATFORM_BUS) +extern _X_EXPORT int platformSlotClaimed; +#endif + extern _X_EXPORT confDRIRec xf86ConfigDRI; extern _X_EXPORT Bool xf86DRI2Enabled(void); @@ -460,4 +465,7 @@ extern _X_EXPORT ScreenPtr xf86ScrnToScreen(ScrnInfoPtr pScrn); #define XF86_SCRN_INTERFACE 1 /* define for drivers to use in api compat */ +/* flags passed to xf86 allocate screen */ +#define XF86_ALLOCATE_GPU_SCREEN 1 + #endif /* _XF86_H */ |