search for: nvunmapmem

...file changed, 1 insertion(+), 1 deletion(-) NOTE: I might have sent this to the wrong ML, this is my first time submitting a nouveau patch. diff --git a/src/nv_driver.c b/src/nv_driver.c index 2b74fc6..0dce0aa 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -60,7 +60,7 @@ static Bool NVUnmapMem(ScrnInfoPtr pScrn); #define NOUVEAU_PCI_DEVICE(_vendor_id, _device_id) \ { (_vendor_id), (_device_id), PCI_MATCH_ANY, PCI_MATCH_ANY, \ - 0x00030000, 0x00ffffff, 0 } + 0x00030000, 0x00fffdff, 0 } static const struct pci_id_match nouveau_device_match...

..., 1 deletion(-) V2: Use 0x00ff0000 PCI device mask instead of 0x00fffdff to align the code with the nouveau kernel driver as requested by Ben. diff --git a/src/nv_driver.c b/src/nv_driver.c index 2b74fc6..d504d3c 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -60,7 +60,7 @@ static Bool NVUnmapMem(ScrnInfoPtr pScrn); #define NOUVEAU_PCI_DEVICE(_vendor_id, _device_id) \ { (_vendor_id), (_device_id), PCI_MATCH_ANY, PCI_MATCH_ANY, \ - 0x00030000, 0x00ffffff, 0 } + 0x00030000, 0x00ff0000, 0 } static const struct pci_id_match nouveau_device_match...

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

...xmir_screen_pre_init(pScrn, pNv->xmir, &xmir_nouveau_driver); + ret = TRUE; + } else + ret = drmmode_pre_init(pScrn, pNv->dev->fd, pScrn->bitsPerPixel >> 3); if (ret == FALSE) NVPreInitFail("Kernel modesetting failed to initialize\n"); @@ -1168,7 +1308,8 @@ NVUnmapMem(ScrnInfoPtr pScrn) { NVPtr pNv = NVPTR(pScrn); - drmmode_remove_fb(pScrn); + if (!xorgMir) + drmmode_remove_fb(pScrn); nouveau_bo_ref(NULL, &pNv->transfer); nouveau_bo_ref(NULL, &pNv->scanout); @@ -1368,6 +1509,11 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL) else fbPictureI...