From Bugzilla Helper:
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.1a) Gecko/20020702

Description of problem:
Trying to recompile i830.o from XFree86 using kernel include files

Version-Release number of selected component (if applicable):
kernel-source-2.4.18-5

How reproducible:
Always

Steps to Reproduce:
1. rpm -Uvh XFree86-4.2.0-8.src.rpm
2. rpm -Uvh kernel-source-2.4.18-5
3. rpm -bc /usr/src/redhat/SPECS/XFree86.spec
cd
/usr/src/redhat/BUILD/XFree86-4.2.0/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel

make TREE=/usr/src/linux-2.4.18-5/include/ -f Makefile.linux i830.o

Actual Results:  cc -O2 -Wall -Wwrite-strings -Wpointer-arith -Wcast-align
-Wstrict-prototypes -Wnested-externs -Wpointer-arith -D__KERNEL__ -DMODULE
-fomit-frame-pointer -DCONFIG_AGP -DCONFIG_AGP_MODULE -DCONFIG_DRM_SIS
-DMODVERSIONS -I/lib/modules/2.4.18-5/build/include -include
/lib/modules/2.4.18-5/build/include/linux/modversions.h -DEXPORT_SYMTAB
-I/lib/modules/2.4.18-5/build/include -c i830_drv.c -o i830_drv.o
cc -O2 -Wall -Wwrite-strings -Wpointer-arith -Wcast-align -Wstrict-prototypes
-Wnested-externs -Wpointer-arith -D__KERNEL__ -DMODULE -fomit-frame-pointer
-DCONFIG_AGP -DCONFIG_AGP_MODULE -DCONFIG_DRM_SIS -DMODVERSIONS
-I/lib/modules/2.4.18-5/build/include -include
/lib/modules/2.4.18-5/build/include/linux/modversions.h
-I/lib/modules/2.4.18-5/build/include -c i830_dma.c -o i830_dma.o
i830_dma.c: In function `i830_unmap_buffer':
i830_dma.c:254: too few arguments to function `do_munmap_R4545600f'
i830_dma.c: In function `i830_free_page':
i830_dma.c:320: structure has no member named `wait'
i830_dma.c: In function `i830_wait_ring':
i830_dma.c:384: warning: implicit declaration of function `udelay'
i830_dma.c:366: warning: unused variable `i'
make: *** [i830_dma.o] Error 1


Unfortunately, I am not able to provide a patch for it.


Expected Results:  As far as I understand, this comes from inconsistencies
between include
files in XFree86 and the redhat kernel, both being plain redhat rpms.

Additional info:

From the web pages
	http://www.cse.unsw.edu.au/~chak/linux/c400.html
	http://www.jongans.com/gateway1450.html
we know that the 830M video driver can be patch to run:
1) patch /usr/src/linux-2.4.18-5/drivers/char/agp/agpgart_be.c
to create the new module agpgart.o
This works fine.

2) patch
XFree86-4.2.0/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/i830/i830_dma.c

But here, even if the patch can work with some minor changes, the compilation
fails. This is not surprising as it already fails without any patch.

I was answered that with the plain kernel-2.4.18 (not readhat one)
this would work.
So I would be glad to see patches for this part of the kernel (or XFree86?)
so that we could take advantage of XFree86 patches.

Today, the 830M is working without i830.o, i.e. without DRI,
as long as agpgart.o is patched. I would be glad to be able to use
also DRI while keeping redhat kernel.



N.B. The laptop that I used for this is an HP omnibook xt6050.
This bug is related to Bug -  65661 and Bug -  66687 but with
a more general framework.