search for: xf86drvmsg

...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 = 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; + if (xorgWa...

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

...}; @@ -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"); + return FALSE; + } + if (xwl_drm_pre_init(xwl_screen) != Success) { + xwl_screen_destroy(xwl_screen); + xf86DrvMsg(-1, X_ERROR, "Failed to initialise xwayland drm.\n"); + return FALSE; + } + ret = nouveau_device_wrap...

...+ if (!drmmode_output->backlight_iface || level < 0) + return; + + len = snprintf(val, BACKLIGHT_VALUE_LEN, "%d\n", level); + sprintf(path, "%s/%s/brightness", + BACKLIGHT_CLASS, drmmode_output->backlight_iface); + fd = open(path, O_RDWR); + if (fd == -1) { + xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, + "failed to open %s for backlight control: %s\n", + path, strerror(errno)); + return; + } + + ret = write(fd, val, len); + if (ret == -1) { + xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, +...

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

..._screen_init(ScreenPtr screen) 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/n...

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

...tions(-) diff --git a/src/nv_driver.c b/src/nv_driver.c index f60b6d9..2c953da 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -194,6 +194,38 @@ NVIdentify(int flags) } } +static Bool glxIsCompatible() +{ + XF86ModuleData *d = LoaderSymbol("glxModuleData"); + + if (!d) { + xf86DrvMsg(-1, X_INFO, + "NOUVEAU: Couldn't find glx module informations. " + "Assuming it is disabled.\n"); + return TRUE; + } + + if (!d->vers) { + xf86DrvMsg(-1, X_ERROR, + "NOUVEAU: glx module has no version information!\n"); + return FALSE; + } + + if (!d-&gt...

...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, >>...

...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(p...

...@ NVHasKMS(struct pci_device *pci_dev) } static Bool +NVHasMirSupport(struct pci_device *pci_dev) +{ + char *busid; + + busid = XNFprintf("pci:%04x:%02x:%02x.%d", + pci_dev->domain, 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 err; + INT32 atom_range[2]; + + atom_range[0] = min; + atom_range[1] = max; + + *atom = MakeAtom(name, strlen(name), TRUE); + err = RRConfigureOutputProperty(output->randr_output, *atom, + FALSE, TRUE, immutable, + 2, atom_range); + if (err != 0) { + xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, + "RRConfigureOutputProperty error, %d\n", err); + } + err = RRChangeOutputProperty(output->randr_output, *atom, + XA_INTEGER, 32, PropModeReplace, 1, &value, FALSE, TRUE); + if (err != 0) { + xf86DrvMsg(output->scrn->s...

...NTS(0, &reg)); + else if (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)...

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

...+), 2 deletions(-) diff --git a/src/nv_dma.c b/src/nv_dma.c index d2a6d00..339b4fe 100644 --- a/src/nv_dma.c +++ b/src/nv_dma.c @@ -53,8 +53,13 @@ NVInitDma(ScrnInfoPtr pScrn) ret = nouveau_object_new(device, 0, NOUVEAU_FIFO_CHANNEL_CLASS, data, size, &pNv->channel); if (ret) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Error creating GPU channel: %d\n", ret); + if (ret == -ENODEV) + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "'No such device' while creating GPU channel: perhaps you disabled " + "accelleration in your modu...

...d) { + counter++; if (e == event_data) { xorg_list_del(&e->head); e->func((void *)(e + 1), e->name, ust, frame); @@ -174,6 +179,12 @@ drmmode_event_handler(int fd, unsigned int frame, unsigned int tv_sec, break; } } + + if (counter > 100 && !warned) { + xf86DrvMsg(0, X_WARNING, + "Event handler iterated %d times\n", counter); + warned = true; + } } void -- 2.26.2

[PATCH 1/3] kms: Don't hardcode the output properties [PATCH 2/3] kms: Implement output->get_property when RandR1.3 is available. [PATCH 3/3] kms: Add TV-out support src/drmmode_display.c | 403 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 261 insertions(+), 142 deletions(-)

...diff --git a/src/nv_driver.c b/src/nv_driver.c index e726292..4c40763 100644 --- a/src/nv_driver.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

...mmode_pre_init(ScrnInfoPtr pScrn, 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...

...AC_FP_VDISP_END) + 1; + nv_output->fpWidth = NVOutputReadRAMDAC(output, NV_RAMDAC_FP_HDISP_END) + 1; + nv_output->fpHeight = NVOutputReadRAMDAC(output, NV_RAMDAC_FP_VDISP_END) + 1; nv_output->fpSyncs = NVOutputReadRAMDAC(output, NV_RAMDAC_FP_CONTROL) & 0x30000033; - // xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Panel size is %i x %i\n", - // nv_output->fpWidth, nv_output->fpHeight); + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Panel size is %i x %i\n", + nv_output->fpWidth, nv_output->fpHeight); return NULL; @...