xserver: Branch 'master'

[Matthias Hopf]

 hw/xfree86/os-support/bus/linuxPci.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

New commits:
diff-tree 1627af54497bee659ea30f2850b39cbbf576e22d (from cf7ca9d09cba14d107152a5179de38e5ef7bd784)
Author: Jonathan Lim <jlim at sgi.com>
Date:   Fri Jan 26 13:00:45 2007 +0100

    Call linuxPciOpenFile() for r/w access if applicable.
    
    Currently, the call to linuxPciOpenFile() is always made for read
    only access which causes the subsequent mmap call to fail when the
    memory is mapped read/write.
    
    Xorg #9692

diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index 03388f1..55ed878 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -570,7 +570,8 @@ linuxMapPci(int ScreenNum, int Flags, PC
 
 	xf86InitVidMem();
 
-	if (((fd = linuxPciOpenFile(Tag ,FALSE)) < 0) ||
+       prot = ((Flags & VIDMEM_READONLY) == 0);
+       if (((fd = linuxPciOpenFile(Tag, prot)) < 0) ||
 	    (ioctl(fd, mmap_ioctl, 0) < 0))
 	    break;