diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2010-06-02 15:29:57 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2010-06-15 14:59:25 -0700 |
| commit | 78ffecce368868f7b363e7f520d163e2e4330adc (patch) | |
| tree | 99d96f6acaa2832b6c59e4e6eab54396a241d8a5 /src | |
| parent | 133f7c4d51b3c7d7e1e7af80056947d3a7ec2097 (diff) | |
Revert "Refuse to bind to a device which has kernel modesetting active."
It was superseded by 3e9f7704122e0685ce83f7d3d3630e8a07293671, which depends on
libpciaccess and not libdrm. This is better, because the server already depends
on the former, while the latter is optional.
This reverts commit 17ab5dbea69e690cbf78c25040db518471e0887f.
Conflicts:
src/nv_driver.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/nv_driver.c | 33 |
2 files changed, 1 insertions, 34 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5d57010..2677d9c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ $(LIBDRM_CFLAGS) +AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@ nv_drv_la_LTLIBRARIES = nv_drv.la nv_drv_la_LDFLAGS = -module -avoid-version nv_drv_ladir = @moduledir@/drivers diff --git a/src/nv_driver.c b/src/nv_driver.c index 9fe70b2..d77ea2e 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -33,11 +33,6 @@ #include "xf86int10.h" #include "vbeModes.h" -#ifdef HAVE_KMS -#include <xf86drmMode.h> -#include <dri.h> -#endif - const OptionInfoRec * RivaAvailableOptions(int chipid, int busid); Bool RivaGetScrnInfoRec(PciChipsets *chips, int chip); Bool G80GetScrnInfoRec(PciChipsets *chips, int chip); @@ -835,26 +830,6 @@ NVIsSupported(CARD32 id) return FALSE; } -#ifdef HAVE_KMS -static Bool NVKernelModesettingEnabled(struct pci_device *device) -{ - char *busIdString; - int ret; - - if (!xf86LoaderCheckSymbol("DRICreatePCIBusID")) - return FALSE; - - busIdString = DRICreatePCIBusID(device); - - ret = drmCheckModesettingSupported(busIdString); - free(busIdString); - - return (ret == 0); -} -#else -static inline Bool NVKernelModesettingEnabled(struct pci_device *device) { return FALSE; } -#endif //HAVE_KMS - /* Mandatory */ #if XSERVER_LIBPCIACCESS static Bool @@ -895,14 +870,6 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_device *dev, intptr_t data) NV_NAME ": Found NVIDIA %s at %2.2x@%2.2x:%2.2x:%1.1x\n", name, dev->bus, dev->domain, dev->dev, dev->func); - /* Trying to bring up a NV mode while kernel modesetting is enabled - results in badness */ - if (NVKernelModesettingEnabled(dev)) { - xf86Msg(X_ERROR, - NV_NAME ": Kernel modesetting driver in use, refusing to load\n"); - return FALSE; - } - if(NVIsG80(id)) return G80GetScrnInfoRec(NULL, entity); else if(dev->vendor_id == PCI_VENDOR_NVIDIA_SGS) |