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

linux: Make failure to iopl non-fatal 

We load the driver list, then enable I/O, then call driver probe based
on whether I/O enable succeeded.  That's bad, because the loaded
security policy might forbid port access.  We happen to treat that as
fatal for some reason, which means even drivers that don't need I/O
access (like kms and fbdev) don't get the chance to run.  Facepalm.

How about we just make that non-fatal instead, that sounds like a much
better plan.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2012-06-26 13:15:45 -04:00
parent 048674a6ae
commit d88fb00d79
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xfree86/os-support/linux/lnx_video.c
View File

@ -510,11 +510,8 @@ static Bool
hwEnableIO(void) hwEnableIO(void)
{ {
if (ioperm(0, 1024, 1) || iopl(3)) { if (ioperm(0, 1024, 1) || iopl(3)) {
if (errno == ENODEV) ErrorF("xf86EnableIOPorts: failed to set IOPL for I/O (%s)\n",
ErrorF("xf86EnableIOPorts: no I/O ports found\n"); strerror(errno));
else
FatalError("xf86EnableIOPorts: failed to set IOPL"
" for I/O (%s)\n", strerror(errno));
return FALSE; return FALSE;
} }
#if !defined(__alpha__) #if !defined(__alpha__)