XLibre/xf86-video-nv
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-nv.git synced 2026-03-24 01:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the kernel driver error reporting to be a little more verbose.

Browse Source 
Commit 3e9f7704122e0685ce83f7d3d3630e8a07293671 added printouts when the driver
detects that a kernel module is attached to the given PCI device.  However, it
uses ErrorF and doesn't print any identifying information about *which* device
has the problem or even which driver is complaining.  Fix it to use xf86DrvMsg
and print the driver name and PCI device and bus IDs.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
This commit is contained in:
Aaron Plattner
2010-06-02 16:06:40 -07:00
parent 4e1efd5222
commit 0f220eb693
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nv_driver.c
View File

@@ -841,9 +841,12 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_device *dev, intptr_t data)
const char *name = xf86TokenToString(NVKnownChipsets, id);
if (pci_device_has_kernel_driver(dev)) {
ErrorF("The PCI device has a kernel module claiming it.\n");
ErrorF("This driver cannot operate until it has been unloaded\n");
return FALSE;
xf86DrvMsg(0, X_ERROR,
NV_NAME ": The PCI device 0x%x (%s) at %2.2x@%2.2x:%2.2x:%1.1x has a kernel module claiming it.\n",
id, name, dev->bus, dev->domain, dev->dev, dev->func);
xf86DrvMsg(0, X_ERROR,
NV_NAME ": This driver cannot operate until it has been unloaded.\n");
return FALSE;
}
if(dev->vendor_id == PCI_VENDOR_NVIDIA && !name &&