search for: entity_num

...er after loading the * driver module. It must be supplied, and gets added the driver list by @@ -89,7 +115,7 @@ _X_EXPORT DriverRec NV = { NVAvailableOptions, NULL, 0, - NULL, + nouveau_driver_func, nouveau_device_match, NVPciProbe }; @@ -215,7 +241,28 @@ NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev, drmVersion *version; int chipset, ret; char *busid; +#ifdef XORG_WAYLAND + struct xwl_screen *xwl_screen = NULL; + if (xorgWayland) { + xwl_screen = xwl_screen_create (); + if (!xwl_screen) { + xf86DrvMsg(-1, X_ERROR, "Failed to initialise xwayland.\n&q...

Here are a few patches adding some missing functions in NvPlatformProbe, which iirc is being used as of xserver 1.13 First patch adds a nouveau_kernel_mode_enabled helper, similar to xf86-video-radeon Second and third use the function in Nv{Pci,Platform}Probe And last one ensures we can still use ZaphodHead and relative head positioning via xorg.conf The coding style may be a bit off, despite my

...r after loading the * driver module. It must be supplied, and gets added the driver list by @@ -88,7 +108,7 @@ _X_EXPORT DriverRec NV = { NVAvailableOptions, NULL, 0, - NULL, + nouveau_driver_func, nouveau_device_match, NVPciProbe }; @@ -214,18 +234,46 @@ NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev, drmVersion *version; int chipset, ret; char *busid; + struct xwl_screen *xwl_screen = NULL; - if (!xf86LoaderCheckSymbol("DRICreatePCIBusID")) { - xf86DrvMsg(-1, X_ERROR, "[drm] No DRICreatePCIBusID symbol\n"); - return FALSE; - } - busid =...

...FALSE; + } + + Bool ok = strcmp(d->vers->vendor, MODULEVENDORSTRING) == 0; + if (!ok) + xf86DrvMsg(-1, X_ERROR, + "NOUVEAU: glx module comes from incompatible vendor: \"%s\"\n", + d->vers->vendor); + + return ok; +} + static Bool NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev, intptr_t match_data) @@ -209,6 +241,9 @@ NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev, int chipset, ret; char *busid; + if (!glxIsCompatible()) + return FALSE; + if (!xf86LoaderCheckSymbol("DRICreatePCIBusID")) { xf86Dr...

...omain, pci_dev->bus, pci_dev->dev, pci_dev->func); + + if (xmir_get_drm_fd(busid) < 0) { + xf86DrvMsg(-1, X_ERROR, "[XMir] GPU %s not handled by Mir\n", busid); + free(busid); + return FALSE; + } + free(busid); + return TRUE; +} + +static Bool NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev, intptr_t match_data) { @@ -343,6 +362,9 @@ NVPciProbe(DriverPtr drv, int entity_num, struct pci_device *pci_dev, }; ScrnInfoPtr pScrn = NULL; + if (xorgMir && !NVHasMirSupport(pci_dev)) + return FALSE; + if (!NVHasKMS(pci_dev)) return FALSE;...

http://bugs.freedesktop.org/show_bug.cgi?id=16165 Summary: Multi-gpu Quadro NVS 400 (NV17a x2) fails to initialise xserver Product: xorg Version: 7.3 Platform: x86 (IA32) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: Driver/nouveau AssignedTo: