Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
src/nv_driver.c | 64 ++++++---------------------------------------------------
1 file changed, 6 insertions(+), 58 deletions(-)
diff --git a/src/nv_driver.c b/src/nv_driver.c
index eff0d47..911b05d 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -319,6 +319,7 @@ nouveau_kernel_mode_enabled(ScrnInfoPtr pScrn, struct
pci_device *pci_dev)
return TRUE;
}
+
static Bool
NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev,
intptr_t match_data)
@@ -328,72 +329,19 @@ NVPciProbe(DriverPtr drv, int entity_num, struct
pci_device *pci_dev,
(pci_dev->vendor_id << 16) | pci_dev->device_id, NULL },
{ -1, -1, NULL }
};
- struct nouveau_device *dev = NULL;
EntityInfoPtr pEnt = NULL;
ScrnInfoPtr pScrn = NULL;
- drmVersion *version;
- int chipset, ret;
- char *busid;
-
- if (!xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
- xf86DrvMsg(-1, X_ERROR, "[drm] No DRICreatePCIBusID symbol\n");
- return FALSE;
- }
- busid = DRICreatePCIBusID(pci_dev);
-
- ret = nouveau_device_open(busid, &dev);
- if (ret) {
- xf86DrvMsg(-1, X_ERROR, "[drm] failed to open device\n");
- free(busid);
- return FALSE;
- }
-
- /* Check the version reported by the kernel module. In theory we
- * shouldn't have to do this, as libdrm_nouveau will do its own checks.
- * But, we're currently using the kernel patchlevel to also version
- * the DRI interface.
- */
- version = drmGetVersion(dev->fd);
- xf86DrvMsg(-1, X_INFO, "[drm] nouveau interface version: %d.%d.%d\n",
- version->version_major, version->version_minor,
- version->version_patchlevel);
- drmFree(version);
-
- chipset = dev->chipset;
- nouveau_device_del(&dev);
-
- ret = drmCheckModesettingSupported(busid);
- free(busid);
- if (ret) {
- xf86DrvMsg(-1, X_ERROR, "[drm] KMS not enabled\n");
- return FALSE;
- }
-
- switch (chipset & 0xf0) {
- case 0x00:
- case 0x10:
- case 0x20:
- case 0x30:
- case 0x40:
- case 0x60:
- case 0x50:
- case 0x80:
- case 0x90:
- case 0xa0:
- case 0xc0:
- case 0xd0:
- case 0xe0:
- break;
- default:
- xf86DrvMsg(-1, X_ERROR, "Unknown chipset: NV%02x\n", chipset);
- return FALSE;
- }
+ int ret;
pScrn = xf86ConfigPciEntity(pScrn, 0, entity_num, NVChipsets,
NULL, NULL, NULL, NULL, NULL);
if (!pScrn)
return FALSE;
+ if (!nouveau_kernel_mode_enabled(pScrn, pci_dev)) {
+ return FALSE;
+ }
+
pScrn->driverVersion = NV_VERSION;
pScrn->driverName = NV_DRIVER_NAME;
pScrn->name = NV_NAME;
--
1.8.0
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/nouveau
