search for: driverptr

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

...er.c +++ b/src/nv_driver.c @@ -32,6 +32,10 @@ #ifdef DRI2 #include "dri2.h" #endif +#ifdef XORG_WAYLAND +#include <xf86Priv.h> +#include <xwayland.h> +#endif /* * Forward definitions for the functions that make up the driver. @@ -73,6 +77,28 @@ static Bool NVPciProbe ( DriverPtr drv, struct pci_device *dev, intptr_t match_data ); + +static Bool nouveau_driver_func(ScrnInfoPtr pScrn, + xorgDriverFuncOp op, + pointer ptr) +{ + xorgHWFlags *flag; + + switch (op) { + case GET_REQUIRED_HW_INTERFACES: + flag = (CARD32*)ptr; + (*flag) = 0; +#ifdef XORG_WAYL...

...bin_start[], _binary_memdisk_bin_end[] and _binary_memdisk_bin_size[]; These variables are declared (as extern const chat in 'setup.c') but never defined in the code. Yet, it seems that somehow they are initialized with the size and start address of memdisk. How can it be? 2) What is driverptr (declared in setup())? It is defined as driverptr = driverseg << 16; Why is it shifted by 16-bits? Thanks. Best regards, Alex

...0x%04x 15E801: 0x%04x 0x%04x\n", - pptr->memint1588, pptr->mem1mb, pptr->mem16mb); + if (!quiet) + printf("1588: 0x%04x 15E801: 0x%04x 0x%04x\n", + pptr->memint1588, pptr->mem1mb, pptr->mem16mb); driverseg = driveraddr >> 4; driverptr = driverseg << 16; @@ -1007,7 +1026,8 @@ if (getcmditem("nopass") != CMD_NOTFOUND) { /* nopass specified - we're the only drive by definition */ - printf("nopass specified - we're the only drive\n"); + if (!quiet) + printf("nopass spec...

...= nouveau_auth_magic; +#endif + #if DRI2INFOREC_VERSION >= 6 dri2.SwapLimitValidate = nouveau_dri2_swap_limit_validate; #endif diff --git a/src/nv_driver.c b/src/nv_driver.c index beef789..fb29ce5 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -72,6 +72,26 @@ static Bool NVPciProbe ( DriverPtr drv, struct pci_device *dev, intptr_t match_data ); + +static Bool nouveau_driver_func(ScrnInfoPtr pScrn, + xorgDriverFuncOp op, + pointer ptr) +{ + xorgHWFlags *flag; + + switch (op) { + case GET_REQUIRED_HW_INTERFACES: + flag = (CARD32*)ptr; + (*flag) = 0; + if (xorgWaylan...

...n"); + return 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...

...+ 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 entity_num, struct pci_device *pci_dev, }; ScrnInfoPtr pScrn = NULL; + if (xorgMir && !NVHasMirSupport(pci_dev)) + return FALSE; + if (!NVHasKMS(pci_dev))...

--- src/nv_driver.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/nv_driver.c b/src/nv_driver.c index a7cf2dc..6f7fc0e 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -780,6 +780,12 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_device *dev, intptr_t data) NVGetPCIXpressChip(dev) : dev->vendor_id << 16 | dev->device_id; const char *name = xf86TokenToString(NVKnownChipsets, id); + if (pci_device_has_kernel_driver(dev)) { + ErrorF("The PCI device h...

...2_t diskbuf; uint32_t disksize; @@ -816,6 +834,7 @@ void setup(const struct real_mode_args *rm_args_ptr) unsigned int bin_size; char *memdisk_hook; struct memdisk_header *hptr; + struct safe_hook *safe_hook; struct patch_area *pptr; uint16_t driverseg; uint32_t driverptr, driveraddr; @@ -899,6 +918,7 @@ void setup(const struct real_mode_args *rm_args_ptr) /* Figure out where it needs to go */ hptr = (struct memdisk_header *)memdisk_hook; + safe_hook = (struct safe_hook *)(memdisk_hook + hptr->int13_offs); pptr = (struct patch_area *)(memdisk_...

Hi, Please find attached the patches which I currently use on my desktop machine for dual head with the randr branch to fix the issues which I found. They may help others as well but may e.g. also disable the Xv blitter which might be working for some (but didn't on my card) - more information is found in the text comments in the patches. I have to hurry so this is short, will be back.