patch to enable the i810 module
| Newsgroups | gmane.comp.freedesktop.xserver |
|---|---|
| Message-ID | <1068816451.16260.9.camel@x30> |
hi, played around with the xserver a bit and managed to compile the i810 module. with the patch and the Makefile.am after copying mach64/fourcc.h in the i810 folder. [ fourcc.h whoud now be three times in the cvs: i810/fourcc.h mach64/fourcc.h nvidia/fourcc.h] but it does not start; quiting with: No matching card found! Fatal server error: No matching cards found! xinit: Server error. --- for the XFree86 server i need to configure BusID "PCI:0:2:0" for it to work in XF86Config is there a way to set that as a command line option? all this is on an IBM X30 with an i830M video card. j
xserver.i810.patch
(text/x-patch, 2.4 KB)
? hw/kdrive/i810/Makefile.am
? hw/kdrive/i810/fourcc.h
Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.36
diff -u -r3.36 configure.ac
--- configure.ac 11 Nov 2003 23:43:45 -0000 3.36
+++ configure.ac 14 Nov 2003 13:16:22 -0000
@@ -352,5 +352,6 @@
hw/kdrive/smi/Makefile
hw/kdrive/nvidia/Makefile
hw/kdrive/r128/Makefile
+hw/kdrive/i810/Makefile
hw/xnest/Makefile
])
Index: hw/kdrive/Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/Makefile.am,v
retrieving revision 1.14
diff -u -r1.14 Makefile.am
--- hw/kdrive/Makefile.am 28 Oct 2003 22:27:35 -0000 1.14
+++ hw/kdrive/Makefile.am 14 Nov 2003 13:16:22 -0000
@@ -1,5 +1,5 @@
if KDRIVEVESA
-VESA_SUBDIRS = vesa mach64 mga nvidia r128 smi
+VESA_SUBDIRS = vesa mach64 mga nvidia r128 i810 smi
endif
SUBDIRS = \
Index: hw/kdrive/i810/i810.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/i810/i810.c,v
retrieving revision 1.4
diff -u -r1.4 i810.c
--- hw/kdrive/i810/i810.c 11 Sep 2003 05:12:51 -0000 1.4
+++ hw/kdrive/i810/i810.c 14 Nov 2003 13:16:27 -0000
@@ -49,7 +49,7 @@
#include "kxv.h"
#include "i810.h"
-#include "linux/agp.h"
+#include "agp.h"
#include "i810draw.h"
Index: hw/kdrive/i810/i810_video.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/i810/i810_video.c,v
retrieving revision 1.4
diff -u -r1.4 i810_video.c
--- hw/kdrive/i810/i810_video.c 11 Sep 2003 05:12:51 -0000 1.4
+++ hw/kdrive/i810/i810_video.c 14 Nov 2003 13:16:30 -0000
@@ -75,9 +75,9 @@
#include "kxv.h"
#include "i810.h"
-#include "Xv.h"
+#include "X11/extensions/Xv.h"
-#include "../../xfree86/common/fourcc.h"
+#include "fourcc.h"
typedef struct {
CARD32 size;
Index: hw/kdrive/i810/i810draw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/i810/i810draw.c,v
retrieving revision 1.2
diff -u -r1.2 i810draw.c
--- hw/kdrive/i810/i810draw.c 11 Sep 2003 05:12:51 -0000 1.2
+++ hw/kdrive/i810/i810draw.c 14 Nov 2003 13:16:30 -0000
@@ -45,7 +45,7 @@
#include "i810.h"
#include "i810_reg.h"
-#include "Xmd.h"
+#include "X11/Xmd.h"
#include "gcstruct.h"
#include "scrnintstr.h"
#include "pixmapstr.h"
Makefile.am
(text/x-makefile, 613 B)
INCLUDES = \
@KDRIVE_INCS@ \
-I$(top_srcdir)/hw/kdrive/vesa \
@XSERVER_CFLAGS@
bin_PROGRAMS = Xi810
if TSLIB
TSLIB_FLAG = -lts
endif
noinst_LIBRARIES = libi810.a
libi810_a_SOURCES = \
i810.c \
i810draw.c \
i810_video.c \
i810_reg.h \
i810_cursor.c \
i810.h \
i810.h \
i810draw.h
Xi810_SOURCES = \
i810stub.c
I810_LIBS = \
libi810.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a
Xi810_LDADD = \
$(I810_LIBS) \
@KDRIVE_LIBS@ \
@XSERVER_LIBS@ \
$(TSLIB_FLAG)
Xi810_DEPENDENCIES = $(I810_LIBS) @KDRIVE_LIBS@