summaryrefslogtreecommitdiff
path: root/x11/XFree86-4-libraries
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2000-08-01 16:28:26 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2000-08-01 16:28:26 +0000
commitb106bcd41c76d2db23a89ef7799593811d4e9f39 (patch)
tree48befbf854b3ee7e5b5d212865b164c6dcb7a06b /x11/XFree86-4-libraries
parentOoops, that's what you get for always installing your window manager first. (diff)
Now that FreeBSD has native `agpgart' interface,
let X server run on the i810 hardware. Enjoy!!!
Notes
Notes: svn path=/head/; revision=31215
Diffstat (limited to 'x11/XFree86-4-libraries')
-rw-r--r--x11/XFree86-4-libraries/files/patch-i81051
1 files changed, 51 insertions, 0 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-i810 b/x11/XFree86-4-libraries/files/patch-i810
new file mode 100644
index 000000000000..2c597830f7f5
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-i810
@@ -0,0 +1,51 @@
+Index: programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c,v
+retrieving revision 1.9
+diff -u -p -r1.9 i810_memory.c
+--- programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c 2000/06/20 05:08:46 1.9
++++ programs/Xserver/hw/xfree86/drivers/i810/i810_memory.c 2000/08/01 12:29:11
+@@ -40,6 +40,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #ifdef linux
+ #include <asm/ioctl.h>
+ #include <linux/agpgart.h>
++#elif defined(__FreeBSD__)
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <sys/agpio.h>
+ #endif
+
+ #ifdef XFree86LOADER
+@@ -76,7 +80,7 @@ int I810AllocHigh( I810MemRange *result,
+
+ int I810AllocateGARTMemory( ScrnInfoPtr pScrn )
+ {
+-#ifdef linux
++#if defined(linux) || defined(__FreeBSD__)
+ struct _agp_info agpinf;
+ struct _agp_bind bind;
+ struct _agp_allocate alloc;
+@@ -111,12 +115,14 @@ int I810AllocateGARTMemory( ScrnInfoPtr
+ return FALSE;
+ }
+
++#ifndef __FreeBSD__
+ if (agpinf.version.major != 0 ||
+ agpinf.version.minor != 99) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Agp kernel driver version not correct\n");
+ return FALSE;
+ }
++#endif
+
+
+ /* Treat the gart like video memory - we assume we own all that is
+@@ -223,7 +229,7 @@ int I810AllocateGARTMemory( ScrnInfoPtr
+
+ void I810FreeGARTMemory( ScrnInfoPtr pScrn )
+ {
+-#ifdef linux
++#if defined(linux) || defined(__FreeBSD__)
+ I810Ptr pI810 = I810PTR(pScrn);
+
+ if (pI810->gartfd != -1) {