frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bus: Trust the kernel when registering driver resources 

... everywhere, not just (linux && (ia64 || alpha)).
This commit is contained in:
Adam Jackson 2008-10-11 21:41:47 -04:00
parent 8397df8945
commit ee8b5cf94c
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/xfree86/common/xf86Bus.c
View File

@ -1349,13 +1349,13 @@ xf86ConvertListToHost(int entityIndex, resPtr list)
/* /*
* xf86RegisterResources() -- attempts to register listed resources. * xf86RegisterResources() -- attempts to register listed resources.
* Returns a resPtr listing all resources not successfully registered. * Returns a resPtr listing all resources not successfully registered, by
* which we mean, NULL.
*/ */
_X_EXPORT resPtr _X_EXPORT resPtr
xf86RegisterResources(int entityIndex, resList list, unsigned long access) xf86RegisterResources(int entityIndex, resList list, unsigned long access)
{ {
resPtr res = NULL;
resRange range; resRange range;
resList list_f = NULL; resList list_f = NULL;
@ -1371,15 +1371,7 @@ xf86RegisterResources(int entityIndex, resList list, unsigned long access)
range.type = (range.type & ~ResAccMask) | (access & ResAccMask); range.type = (range.type & ~ResAccMask) | (access & ResAccMask);
} }
range.type &= ~ResEstimated; /* Not allowed for drivers */ range.type &= ~ResEstimated; /* Not allowed for drivers */
#if !((defined(__alpha__) || (defined(__ia64__))) && defined(linux)) Acc = xf86AddResToList(Acc,&range,entityIndex);
/* On Alpha Linux, do not check for conflicts, trust the kernel. */
if (checkConflict(&range, Acc, entityIndex, SETUP,TRUE))
res = xf86AddResToList(res,&range,entityIndex);
else
#endif
{
Acc = xf86AddResToList(Acc,&range,entityIndex);
}
list++; list++;
} }
if (list_f) if (list_f)
@ -1389,11 +1381,7 @@ xf86RegisterResources(int entityIndex, resList list, unsigned long access)
xf86MsgVerb(X_INFO, 3,"Resources after driver initialization\n"); xf86MsgVerb(X_INFO, 3,"Resources after driver initialization\n");
xf86PrintResList(3, Acc); xf86PrintResList(3, Acc);
#endif #endif
if (res) { return NULL;
xf86MsgVerb(X_INFO, 3, "Failed to register resources:\n");
xf86PrintResList(3, res);
}
return res;
} }