openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-14 13:19:23 +00:00
Code Issues Projects Releases Wiki Activity

PR 5005: On alpha, trust the PCI BARS from SRM. ok kettenis@, miod@.

Browse Source
This commit is contained in:
matthieu
2008-10-07 21:56:39 +00:00
parent d2f26af0e2
commit 79662dec2b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xserver/hw/xfree86/common/xf86Bus.c
View File

@@ -1829,7 +1829,8 @@ xf86RegisterResources(int entityIndex, resList list, unsigned long access)
range.type = (range.type & ~ResAccMask) | (access & ResAccMask);
}
range.type &= ~ResEstimated; /* Not allowed for drivers */
#if !((defined(__alpha__) || (defined(__ia64__))) && defined(linux))
#if !((defined(__alpha__) || (defined(__ia64__))) && defined(linux)) && \
!(defined(__alpha__) && defined(__OpenBSD__))
/* On Alpha Linux, do not check for conflicts, trust the kernel. */
if (checkConflict(&range, Acc, entityIndex, SETUP,TRUE))
res = xf86AddResToList(res,&range,entityIndex);
@@ -2451,6 +2452,7 @@ xf86PostProbe(void)
xf86FreeResList(acc);
#if !(defined(__alpha__) && defined(linux)) && \
!(defined(__ia64__) && defined(linux)) && \
!(defined(__alpha__) && defined(__OpenBSD__)) && \
!(defined(__sparc64__) && defined(__OpenBSD__))
/*
* No need to validate on Alpha Linux or OpenBSD/sparc64,