search for: nvpreinit

...des(pScrn)) return FALSE; @@ -350,8 +345,6 @@ NVEnterVT(int scrnIndex, int flags) /* * This is called when VT switching away from the X server. Its job is * to restore the previous (text) mode. - * - * We may wish to remap video/MMIO memory too. */ /* Mandatory */ @@ -586,24 +579,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) MessageType from; int ret, i; - if (flags & PROBE_DETECT) { - EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]); - - if (!pEnt) - return FALSE; - - i = pEnt->index; - xfree(pEnt); - - if (xf86LoadSubModule(pScrn, "vbe")) { -...

...(pScreen); if (!pNv->NoAccel) @@ -507,6 +610,11 @@ NVFreeScreen(int scrnIndex, int flags) if (!pNv) return; +#ifdef XORG_WAYLAND + if (pNv->xwl_screen) + xwl_screen_destroy(pNv->xwl_screen); +#endif + NVCloseDRM(pScrn); free(pScrn->driverPrivate); @@ -568,10 +676,16 @@ NVPreInitDRM(ScrnInfoPtr pScrn) NVPtr pNv = NVPTR(pScrn); char *bus_id; int ret; + int drm_fd; if (!NVDRIGetVersion(pScrn)) return FALSE; +#ifdef XORG_WAYLAND + if (pNv->xwl_screen) + drm_fd = xwl_screen_get_drm_fd(pNv->xwl_screen); + else { +#endif /* Load the kernel module, and open...

...ver.c +++ b/src/nv_driver.c @@ -377,6 +377,7 @@ NVHasKMS(struct pci_device *pci_dev, struct xf86_platform_device *platform_dev) case 0xf0: case 0x100: case 0x110: + case 0x120: break; default: xf86DrvMsg(-1, X_ERROR, "Unknown chipset: NV%02x\n", chipset); @@ -930,6 +931,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) pNv->Architecture = NV_KEPLER; break; case 0x110: + case 0x120: pNv->Architecture = NV_MAXWELL; break; default: -- 2.1.4

..._screen); + drmmode_screen_fini(pScreen); if (!pNv->NoAccel) @@ -499,6 +584,9 @@ NVFreeScreen(FREE_SCREEN_ARGS_DECL) if (!pNv) return; + if (pNv->xwl_screen) + xwl_screen_destroy(pNv->xwl_screen); + NVCloseDRM(pScrn); free(pScrn->driverPrivate); @@ -560,22 +648,29 @@ NVPreInitDRM(ScrnInfoPtr pScrn) NVPtr pNv = NVPTR(pScrn); char *bus_id; int ret; + int drm_fd; if (!NVDRIGetVersion(pScrn)) return FALSE; - /* Load the kernel module, and open the DRM */ - bus_id = DRICreatePCIBusID(pNv->PciInfo); - ret = DRIOpenDRMMaster(pScrn, SAREA_MAX, bus_id, "nou...

...gt;scrnIndex, X_ERROR, "[drm] Failed to open DRM device for %s: %d\n", @@ -723,6 +846,9 @@ static Bool NVOpenDRMMaster(ScrnInfoPtr pScrn) } free(busid); + if (xorgMir) + return TRUE; + sv.drm_di_major = 1; sv.drm_di_minor = 1; sv.drm_dd_major = -1; @@ -818,6 +944,14 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) ) return FALSE; +#ifdef XMIR + if (xorgMir) { + pNv->xmir = xmir_screen_create(pScrn); + if (pNv->xmir == NULL) + NVPreInitFail("Mir failed to initialize\n"); + } +#endif + if (xf86IsEntityShared(pScrn->entityList[0])) { if(!xf86IsPr...

Make it a Bool consistently, as declared in header. Reported-by: Ilia Mirkin <imirkin at alum.mit.edu> Signed-off-by: Mario Kleiner <mario.kleiner.de at gmail.com> --- src/nouveau_present.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nouveau_present.c b/src/nouveau_present.c index 4de1e6e..699a58d 100644 --- a/src/nouveau_present.c +++

...crn); + return FALSE; + } + } + ret = nouveau_pushbuf_new(pNv->client, pNv->channel, 4, 32 * 1024, true, &pNv->pushbuf); if (ret) { diff --git a/src/nv_driver.c b/src/nv_driver.c index beef789..dd6f005 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -815,6 +815,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) if (!pNv->NoAccel && pNv->dev->chipset >= 0x11) { from = X_DEFAULT; + pNv->glx_vblank = TRUE; if (xf86GetOptValBool(pNv->Options, OPTION_GLX_VBLANK, &pNv->glx_vblank)) from = X_CONFIG; diff --git a/src/nv_proto...

...ver.c +++ b/src/nv_driver.c @@ -390,6 +390,7 @@ NVHasKMS(struct pci_device *pci_dev, struct xf86_platform_device *platform_dev) case 0xf0: case 0x100: case 0x110: + case 0x120: break; default: xf86DrvMsg(-1, X_ERROR, "Unknown chipset: NV%02X\n", chipset); @@ -941,6 +942,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) pNv->Architecture = NV_KEPLER; break; case 0x110: + case 0x120: pNv->Architecture = NV_MAXWELL; break; default: diff --git a/src/nvc0_accel.c b/src/nvc0_accel.c index 8da5051..996fb88 100644 --- a/src/nvc0_accel.c +++ b/src/nvc0_accel.c @@ -236,9...

...90,7 @@ NVHasKMS(struct pci_device *pci_dev, struct xf86_platform_device *platform_dev) > case 0xf0: > case 0x100: > case 0x110: > + case 0x120: > break; > default: > xf86DrvMsg(-1, X_ERROR, "Unknown chipset: NV%02X\n", chipset); > @@ -941,6 +942,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) > pNv->Architecture = NV_KEPLER; > break; > case 0x110: > + case 0x120: > pNv->Architecture = NV_MAXWELL; > break; > default: > diff --git a/src/nvc0_accel.c b/src/nvc0_accel.c > index 8da5051..996fb88 100644 > --- a/...

...ver.c +++ b/src/nv_driver.c @@ -390,6 +390,7 @@ NVHasKMS(struct pci_device *pci_dev, struct xf86_platform_device *platform_dev) case 0xf0: case 0x100: case 0x110: + case 0x120: break; default: xf86DrvMsg(-1, X_ERROR, "Unknown chipset: NV%02X\n", chipset); @@ -941,6 +942,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) pNv->Architecture = NV_KEPLER; break; case 0x110: + case 0x120: pNv->Architecture = NV_MAXWELL; break; default: diff --git a/src/nvc0_accel.c b/src/nvc0_accel.c index d0a835e..6c2bae8 100644 --- a/src/nvc0_accel.c +++ b/src/nvc0_accel.c @@ -244,9...

...monInit(ScrnInfoPtr pScrn) case NV_FERMI: case NV_KEPLER: case NV_MAXWELL: + case NV_PASCAL: INIT_CONTEXT_OBJECT(3D_NVC0); break; case NV_TESLA: diff --git a/src/nv_driver.c b/src/nv_driver.c index 61940a8..3afd42e 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -945,6 +945,9 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) case 0x120: pNv->Architecture = NV_MAXWELL; break; + case 0x130: + pNv->Architecture = NV_PASCAL; + break; default: return FALSE; } diff --git a/src/nv_type.h b/src/nv_type.h index 6c3e339..a0c40e3 100644 --- a/src/nv_type.h +++ b/src/nv_type.h @...

...PIXMAP_TILED; /* 'format' is just depth (or 0, or maybe it depends on the caller) */ bpp = round_up_pow2(format ? format : pDraw->depth); diff --git a/src/nv_driver.c b/src/nv_driver.c index 42eb9db..a63674c 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -1082,7 +1082,8 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) pNv->wfb_enabled = xf86ReturnOptValBool( pNv->Options, OPTION_WFB, FALSE); - pNv->tiled_scanout = TRUE; + if (pNv->Architecture >= NV_ARCH_10) + pNv->tiled_scanout = TRUE; } pNv->ce_enabled = -- 2.21.0

...usually talk about it. Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/nv_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nv_driver.c b/src/nv_driver.c index b83b822..44e7496 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -836,7 +836,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) dev = pNv->dev; pScrn->chipset = malloc(sizeof(char) * 25); - sprintf(pScrn->chipset, "NVIDIA NV%02x", dev->chipset); + sprintf(pScrn->chipset, "NVIDIA NV%02X", dev->chipset); xf86DrvMsg(pScrn->scrnIndex, X_PROBED, &quot...

..._platform_device *platform_dev) > case 0xf0: > case 0x100: > case 0x110: > + case 0x120: > break; > default: > xf86DrvMsg(-1, X_ERROR, "Unknown chipset: NV%02x\n", chipset); > @@ -930,6 +931,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) > pNv->Architecture = NV_KEPLER; > break; > case 0x110: > + case 0x120: > pNv->Architecture = NV_MAXWELL; > break; > default: > -- > 2.1.4 > > _...

...er.c +++ b/src/nv_driver.c @@ -391,6 +391,7 @@ NVHasKMS(struct pci_device *pci_dev, struct xf86_platform_device *platform_dev) case 0x100: case 0x110: case 0x120: + case 0x130: break; default: xf86DrvMsg(-1, X_ERROR, "Unknown chipset: NV%02X\n", chipset); @@ -945,6 +946,9 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) case 0x120: pNv->Architecture = NV_MAXWELL; break; + case 0x130: + pNv->Architecture = NV_PASCAL; + break; default: return FALSE; } diff --git a/src/nv_type.h b/src/nv_type.h index 6c3e339..a0c40e3 100644 --- a/src/nv_type.h +++ b/src/nv_type.h @...

...main | NOUVEAU_BO_MAP, 128 * 1024, 128 * 1024, NULL, &pNv->scratch); if (!ret) ret = nouveau_bo_map(pNv->scratch, 0, pNv->client); diff --git a/src/nv_driver.c b/src/nv_driver.c index 8e2ae03..b0e9d11 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -954,7 +954,10 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) * The first thing we should figure out is the depth, bpp, etc. */ - if (dev->vram_size <= 16 * 1024 * 1024) + pNv->vram_domain = NOUVEAU_BO_VRAM; + if (!dev->vram_size) + pNv->vram_domain = NOUVEAU_BO_GART; + else if (dev->vram_size <= 16...

...ule * might refer to. */ - LoaderRefSymLists(vgahwSymbols, exaSymbols, fbSymbols, + LoaderRefSymLists(vgahwSymbols, exaSymbols, fbSymbols, wfbSymbols, ramdacSymbols, shadowSymbols, drmSymbols, i2cSymbols, ddcSymbols, vbeSymbols, int10Symbols, NULL); @@ -1510,10 +1516,22 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) * section. */ - if (xf86LoadSubModule(pScrn, "fb") == NULL) - NVPreInitFail("\n"); +#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,6,99,0,0) + if (!pNv->NoAccel && pNv->exa_driver_pixmaps && pNv->Architecture...

Hi, here a set of patches against the nouveau-ddx. This is an extended and revised set, based on Francisco Jerez feedback from autumn last year. [1/9] Makes pageflipping work again on X-Server 1.12rc. It apparently stopped working somewhere around Xorg 1.11+. [2/9] Implements handling of pageflip completion events from the kernel. Francisco Jerez argument against including it was that the

These are copied directly from the mesa repository. Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/hwdefs/gm107_texture.xml.h | 365 +++++++++++++++++ src/hwdefs/nvc0_3d.xml.h | 867 +++++++++++++++++++++++++---------------- 2 files changed, 892 insertions(+), 340 deletions(-) create mode 100644 src/hwdefs/gm107_texture.xml.h diff --git

I believe I've addressed all the feedback from the first time around, and also made fixes necessary for GM20x based on testing results. I believe now it should actually work for all GM10x and GM20x. Further, GP10x should be very easy to add, but without someone to actually test I didn't want to claim support for it. Ilia Mirkin (7): exa: add GM10x acceleration support hwdefs: update