Re: XFree86 4.2 on ia64
On Wed, 2 Oct 2002, Branden Robinson wrote:
BR> On Wed, Oct 02, 2002 at 06:11:17PM +0100, Stephen Mulcahy wrote:
BR> > I'm finally getting around to looking at this - is it still worth
BR> > doing or is it too late? Sorry about yet another delay, real work took
BR> > priority for the last while I'm afraid.
BR>
BR> Well, why don't you try that latest XFree86 4.2.1 packages I have for
BR> IA-64, available at the URL in my .signature.
BR>
BR> If you have problems with them, let's talk about it on the debian-x
BR> mailing list.
BR>
BR> http://lists.debian.org/debian-x/
Hi,
I tried the latest 4.2.1-0pre1v2 ia64 packages from xsf repository
and I'm still getting the following error when I startx
(EE) ATI(0): Adapters found to be in VGA mode on server entry are not
supported by the MMIO-only version of this driver.
(EE) Screen(s) found, but none have a usable configuration.
This was the same problem I saw with the current development branch of
X and Marc Aurele La France put some patches in to rectify it. I'm not
sure what the cleanest way of presenting those changes is so if
someone has a better idea of how to present them, drop me a mail.
http://www.xfree86.org/pipermail/cvs-commit/2002-July/004655.html
Details the first change - this seems to have been applied by Branden
already according to
http://lists.debian.org/debian-x/2002/debian-x-200210/msg00009.html
The second set of changes are described in
http://www.xfree86.org/pipermail/cvs-commit/2002-July/004728.html
I'm presenting the diffs to each of those files from the previous
revision of the file in the development branch because I'm not sure
what to present as a patch (if I present a patch between xf-4_2-branch
and the current xfree86 devel branch, it'll suck all sorts of
unrelated changes aswell which I assume isn't required) - my cvs is a
little rusty so suggestions on a better approach to this welcome!
Index: xc/extras/x86emu/include/x86emu/types.h
===================================================================
RCS file: /cvs/xc/extras/x86emu/include/x86emu/types.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
39c39
< /* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.4 2000/09/26 15:56:44 tsi Exp $ */
---
> /* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.5 2002/07/23 14:22:45 tsi Exp $ */
65a66
> #undef __HAS_LONG_LONG__
69a71,84
> /* Taken from Xmd.h */
> #undef NUM32
> #if defined(__alpha) || defined(__alpha__) || \
> defined(__ia64__) || defined(ia64) || \
> defined(__sparc64__) || \
> defined(__s390x__) || \
> (defined(__hppa__) && defined(__LP64)) || \
> defined(__x86_64__) || defined(x86_64) || \
> (defined(__sgi) && (_MIPS_SZLONG == 64))
> #define NUM32 int
> #else
> #define NUM32 long
> #endif
>
72c87
< typedef unsigned int u32;
---
> typedef unsigned NUM32 u32;
79c94
< typedef int s32;
---
> typedef NUM32 s32;
87a103,104
>
> #undef NUM32
Index: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -r1.19 -r1.20
1c1
< /* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.19 2002/04/06 18:11:14 tsi Exp $ */
---
> /* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.20 2002/07/23 14:22:46 tsi Exp $ */
408c408
< Mem_rb(int addr)
---
> Mem_rb(CARD32 addr)
414c414
< Mem_rw(int addr)
---
> Mem_rw(CARD32 addr)
420c420
< Mem_rl(int addr)
---
> Mem_rl(CARD32 addr)
426c426
< Mem_wb(int addr, CARD8 val)
---
> Mem_wb(CARD32 addr, CARD8 val)
432c432
< Mem_ww(int addr, CARD16 val)
---
> Mem_ww(CARD32 addr, CARD16 val)
438c438
< Mem_wl(int addr, CARD32 val)
---
> Mem_wl(CARD32 addr, CARD32 val)
Index: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -r1.23 -r1.24
1c1
< /* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.23 2002/04/04 14:05:51 eich Exp $ */
---
> /* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.24 2002/07/23 14:22:46 tsi Exp $ */
172,177c172,177
< CARD8 Mem_rb(int addr);
< CARD16 Mem_rw(int addr);
< CARD32 Mem_rl(int addr);
< void Mem_wb(int addr, CARD8 val);
< void Mem_ww(int addr, CARD16 val);
< void Mem_wl(int addr, CARD32 val);
---
> CARD8 Mem_rb(CARD32 addr);
> CARD16 Mem_rw(CARD32 addr);
> CARD32 Mem_rl(CARD32 addr);
> void Mem_wb(CARD32 addr, CARD8 val);
> void Mem_ww(CARD32 addr, CARD16 val);
> void Mem_wl(CARD32 addr, CARD32 val);
Index: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -r1.11 -r1.12
1c1
< /* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.11 2001/04/30 14:34:58 tsi Exp $ */
---
> /* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.12 2002/07/23 14:22:46 tsi Exp $ */
49,56c49,56
< X86EMU_intrFuncs intFuncs[256];
< X86EMU_pioFuncs pioFuncs = {
< (u8(*)(u16))x_inb,
< (u16(*)(u16))x_inw,
< (u32(*)(u16))x_inl,
< (void(*)(u16, u8))x_outb,
< (void(*)(u16, u16))x_outw,
< (void(*)(u16, u32))x_outl
---
> static X86EMU_intrFuncs intFuncs[256];
> static X86EMU_pioFuncs pioFuncs = {
> x_inb,
> x_inw,
> x_inl,
> x_outb,
> x_outw,
> x_outl
59,65c59,65
< X86EMU_memFuncs memFuncs = {
< (u8(*)(u32))Mem_rb,
< (u16(*)(u32))Mem_rw,
< (u32(*)(u32))Mem_rl,
< (void(*)(u32, u8))Mem_wb,
< (void(*)(u32, u16))Mem_ww,
< (void(*)(u32, u32))Mem_wl
---
> static X86EMU_memFuncs memFuncs = {
> Mem_rb,
> Mem_rw,
> Mem_rl,
> Mem_wb,
> Mem_ww,
> Mem_wl
-stephen
Reply to: