search for: x_info

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 +++

...if (buf && stat(buf, &render) == 0 && master.st_mode == render.st_mode) { pNv->render_node = buf; - return dri3_screen_init(screen, &nouveau_dri3_screen_info); + if (dri3_screen_init(screen, &nouveau_dri3_screen_info)) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "DRI3 on EXA enabled\n"); + return TRUE; + } + else { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "DRI3 on EXA initialization failed\n"); + return FALSE; + } } else free(buf); #endif diff --git a/src/nv_const.h b/src/nv_const.h index f1b4e9b..df1...

...de) { >> pNv->render_node = buf; >> - return dri3_screen_init(screen, &nouveau_dri3_screen_info); >> + if (dri3_screen_init(screen, &nouveau_dri3_screen_info)) { >> + xf86DrvMsg(pScrn->scrnIndex, X_INFO, >> + "DRI3 on EXA enabled\n"); >> + return TRUE; >> + } >> + else { >> + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, >> +...

...pNv->render_node = buf; >>>> - return dri3_screen_init(screen, &nouveau_dri3_screen_info); >>>> + if (dri3_screen_init(screen, &nouveau_dri3_screen_info)) { >>>> + xf86DrvMsg(pScrn->scrnIndex, X_INFO, >>>> + "DRI3 on EXA enabled\n"); >>>> + return TRUE; >>>> + } >>>> + else { >>>> + xf86DrvMsg(pScrn->scrnIndex, X_WARNIN...

..., int fd, int cpp) NVEntPtr pNVEnt = NVEntPriv(pScrn); int i; unsigned int crtcs_needed = 0; + int crtcshift; drmmode = xnfalloc(sizeof *drmmode); drmmode->fd = fd; @@ -1444,8 +1445,9 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp) } xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing outputs ...\n"); + crtcshift = ffs(pNVEnt->assigned_crtcs ^ 0xffffffff) - 1; for (i = 0; i < drmmode->mode_res->count_connectors; i++) - crtcs_needed += drmmode_output_init(pScrn, drmmode, i); + crtcs_needed += drmmode_output_init(pScrn, drmmode, i, crtcshif...

https://bugs.freedesktop.org/show_bug.cgi?id=92178 Bug ID: 92178 Summary: nouveau framebuffer fails to initialize properly on GeForce 2 Go (NV11M) Product: xorg Version: unspecified Hardware: x86 (IA32) OS: Linux (All) Status: NEW Severity: normal Priority: medium

...quot; + */ #if NV_DMA_DEBUG == 1 #define WRITE_PUT(pNv, data) { \ volatile CARD8 scratch; \ _NV_FENCE() \ scratch = ((char*)(pNv)->FB->map)[0]; \ - (pNv)->FIFO[0x0010] = ((data) << 2) + pNv->fifo.put_base; \ - xf86DrvMsg(0, X_INFO, "WRITE_PUT: 0x%08x\n", ((data) << 2) + pNv->fifo.put_base); \ + (pNv)->FIFO[0x0010] = ((data) << 2) + (pNv)->fifo.put_base; \ + xf86DrvMsg(0, X_INFO, "WRITE_PUT: 0x%08x\n", ((data) << 2) + (pNv)->fifo.put_base); \ mem_barrier();...

Fixes bug 24595. Signed-off-by: Francisco Jerez <currojerez at riseup.net> --- src/nv_crtc.c | 34 ++++------------------------------ 1 files changed, 4 insertions(+), 30 deletions(-) diff --git a/src/nv_crtc.c b/src/nv_crtc.c index 2ae36a0..9708741 100644 --- a/src/nv_crtc.c +++ b/src/nv_crtc.c @@ -888,8 +888,6 @@ static void nv_crtc_unlock(xf86CrtcPtr crtc) { } -#define

...de = buf; >>>>>> - return dri3_screen_init(screen, &nouveau_dri3_screen_info); >>>>>> + if (dri3_screen_init(screen, &nouveau_dri3_screen_info)) { >>>>>> + xf86DrvMsg(pScrn->scrnIndex, X_INFO, >>>>>> + "DRI3 on EXA enabled\n"); >>>>>> + return TRUE; >>>>>> + } >>>>>> + else { >>>>>> +...

...unsigned int crtcs_needed = 0; > + int crtcshift; > > drmmode = xnfalloc(sizeof *drmmode); > drmmode->fd = fd; > @@ -1444,8 +1445,9 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp) > } > > xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing outputs ...\n"); > + crtcshift = ffs(pNVEnt->assigned_crtcs ^ 0xffffffff) - 1; Mario, any objections if I touch this up as ~pNVEnc->assigned_crtcs? XOR with ~0 is not a pattern I've seen a lot. > for (i = 0; i < drmmode->mode_res->c...

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

...7,6 +389,9 @@ NVPlatformProbe(DriverPtr driver, if (!dev->pdev) return FALSE; + if (xorgMir && !NVHasMirSupport(dev->pdev)) + return FALSE; + if (!NVHasKMS(dev->pdev)) return FALSE; @@ -424,9 +449,11 @@ NVEnterVT(VT_FUNC_ARGS_DECL) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "NVEnterVT is called.\n"); - ret = drmSetMaster(pNv->dev->fd); - if (ret) - ErrorF("Unable to get master: %s\n", strerror(errno)); + if (!xorgMir) { + ret = drmSetMaster(pNv->dev->fd); + if (ret) + ErrorF("Unable to get master: %s\n", strerror(errno...

Had those patches living in my local tree for a while now. Here is a respin on top of latest master Patch 1: regression fix, preventing the ddx from loading if kernel module is not loaded Patches 2-5: Completely nuke dri1, make dri2 hard dependency Patches 6-7: Assist people with first-time build of nouveau Git complains about whitespace errors in patch 7, which for the sake of me I cannot

...->width, + mask->pDrawable->height); + if (mask->repeat != RepeatNone) strcat(out, "R "); - if (pMaskPicture->componentAlpha) + if (mask->componentAlpha) strcat(out, "C "); out += strlen(out); } strcat(out, "\n"); + xf86DrvMsg(0, X_INFO, "%s", out2); } #else -#define NV10EXAFallbackInfo(X,Y,Z,S,T) do { ; } while (0) +#define print_fallback_info(...) #endif -Bool NV10EXACheckComposite(int op, - PicturePtr pSrcPicture, - PicturePtr pMaskPicture, - PicturePtr pDstPicture) +Bool +NV10EXACheckComposite(int op, Pict...

...(pNv->Architecture >= NV_ARCH_50) NV50SyncToVBlank(dst_pix, REGION_EXTENTS(0, &reg)); else diff --git a/src/nv_dma.c b/src/nv_dma.c index d2a6d00..47c7e12 100644 --- a/src/nv_dma.c +++ b/src/nv_dma.c @@ -63,6 +63,18 @@ NVInitDma(ScrnInfoPtr pScrn) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Opened GPU channel %d\n", fifo->channel); + if (pNv->Architecture >= NV_ARCH_C0) { + struct nvc0_fifo *data = (struct nvc0_fifo *)fifo; + ret = nouveau_bo_wrap(pNv->dev, data->notify, + &pNv->notifier_bo); + if (ret) { + xf86DrvM...

...0x110) { class = 0xa197; handle = 0x0000906e; - } else { + } else if (pNv->dev->chipset < 0x120) { class = 0xb097; handle = 0x0000906e; + } else if (pNv->dev->chipset < 0x130) { + class = 0xb197; + handle = 0x0000906e; + } else { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "No 3D acceleration support for NV%X\n", + pNv->dev->chipset); + return FALSE; } ret = nouveau_object_new(pNv->channel, class, class, -- 2.7.3

...00906e; > - } else { > + } else if (pNv->dev->chipset < 0x120) { > class = 0xb097; > handle = 0x0000906e; > + } else if (pNv->dev->chipset < 0x130) { > + class = 0xb197; > + handle = 0x0000906e; > + } else { > + xf86DrvMsg(pScrn->scrnIndex, X_INFO, > + "No 3D acceleration support for NV%X\n", > + pNv->dev->chipset); > + return FALSE; > } > > ret = nouveau_object_new(pNv->channel, class, class, > -- -Samuel

...0x110) { class = 0xa197; handle = 0x0000906e; - } else { + } else if (pNv->dev->chipset < 0x120) { class = 0xb097; handle = 0x0000906e; + } else if (pNv->dev->chipset < 0x130) { + class = 0xb197; + handle = 0x0000906e; + } else { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "No 3D acceleration support for NV%X\n", + pNv->dev->chipset); + return FALSE; } ret = nouveau_object_new(pNv->channel, class, class, -- 2.7.3

...chipset < 0x130) { class = 0xb197; handle = 0x0000906e; + } else if (pNv->dev->chipset == 0x130) { + class = 0xc097; + handle = 0x0000906e; + } else if (pNv->dev->chipset < 0x140) { + class = 0xc197; + handle = 0x0000906e; } else { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "No 3D acceleration support for NV%X\n", -- 2.10.2

...= drmGetRenderDeviceNameFromFd(pNv->dev->fd); - if (buf && stat(buf, &render) == 0 && - master.st_mode == render.st_mode) { + if (buf) { pNv->render_node = buf; if (dri3_screen_init(screen, &nouveau_dri3_screen_info)) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, -- 2.13.6