From 1627af54497bee659ea30f2850b39cbbf576e22d Mon Sep 17 00:00:00 2001 From: Jonathan Lim Date: Fri, 26 Jan 2007 13:00:45 +0100 Subject: [PATCH] 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 --- hw/xfree86/os-support/bus/linuxPci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index 03388f1ff..55ed87859 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, PCITAG Tag, 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;