configure.ac | 2 +- src/drmmode_display.c | 6 ++++++ src/nouveau_xv.c | 2 ++ src/nv_driver.c | 6 ++++-- 4 files changed, 13 insertions(+), 3 deletions(-)
New commits: commit 480f0998ffed6d9a5c6656dba75182f00fd88a1b Author: Ben Skeggs <[email protected]> Date: Thu Nov 7 14:56:48 2013 +1000 bump to 1.0.10 for release Signed-off-by: Ben Skeggs <[email protected]> diff --git a/configure.ac b/configure.ac index eff9087..c524660 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ([2.60]) AC_INIT([xf86-video-nouveau], - [1.0.9], + [1.0.10], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-nouveau]) commit 59395c738ebdc21087109075ada67ea8d7783141 Author: Ben Skeggs <[email protected]> Date: Thu Nov 7 14:56:06 2013 +1000 recognise GK208 as a Kepler board Signed-off-by: Ben Skeggs <[email protected]> diff --git a/src/nv_driver.c b/src/nv_driver.c index 44e7496..5131dcd 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -309,7 +309,7 @@ NVHasKMS(struct pci_device *pci_dev) nouveau_device_del(&dev); - switch (chipset & 0xf0) { + switch (chipset & ~0xf) { case 0x00: case 0x10: case 0x20: @@ -324,6 +324,7 @@ NVHasKMS(struct pci_device *pci_dev) case 0xd0: case 0xe0: case 0xf0: + case 0x100: break; default: xf86DrvMsg(-1, X_ERROR, "Unknown chipset: NV%02x\n", chipset); @@ -839,7 +840,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) sprintf(pScrn->chipset, "NVIDIA NV%02X", dev->chipset); xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Chipset: \"%s\"\n", pScrn->chipset); - switch (dev->chipset & 0xf0) { + switch (dev->chipset & ~0xf) { case 0x00: pNv->Architecture = NV_ARCH_04; break; @@ -868,6 +869,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) break; case 0xe0: case 0xf0: + case 0x100: pNv->Architecture = NV_ARCH_E0; break; default: commit 03642323a954d0adb11662a98e92dfa20bee9728 Author: Dave Airlie <[email protected]> Date: Wed Jul 31 11:19:50 2013 +1000 nouveau: fix build against older servers. Older servers had no GPU support. Signed-off-by: Dave Airlie <[email protected]> diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 3563b2a..cc141a0 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -1098,10 +1098,12 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num) if (koutput->connector_type >= NUM_OUTPUT_NAMES) snprintf(name, 32, "Unknown%d-%d", koutput->connector_type, koutput->connector_type_id); +#ifdef NOUVEAU_PIXMAP_SHARING else if (pScrn->is_gpu) snprintf(name, 32, "%s-%d-%d", output_names[koutput->connector_type], pScrn->scrnIndex - GPU_SCREEN_OFFSET + 1, koutput->connector_type_id); +#endif else snprintf(name, 32, "%s-%d", output_names[koutput->connector_type], commit 27323ce68d58fcb82a648ab14abbc99acdc36f44 Author: Dave Airlie <[email protected]> Date: Wed Jul 31 11:01:15 2013 +1000 nouveau: add gpu identifier to connector names for secondary gpus this avoids clashes with identifiers from other GPUs. Signed-off-by: Dave Airlie <[email protected]> diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 570a9e4..3563b2a 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -1098,6 +1098,10 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num) if (koutput->connector_type >= NUM_OUTPUT_NAMES) snprintf(name, 32, "Unknown%d-%d", koutput->connector_type, koutput->connector_type_id); + else if (pScrn->is_gpu) + snprintf(name, 32, "%s-%d-%d", + output_names[koutput->connector_type], pScrn->scrnIndex - GPU_SCREEN_OFFSET + 1, + koutput->connector_type_id); else snprintf(name, 32, "%s-%d", output_names[koutput->connector_type], commit 1df177f35a05db505577cdc929e63fde906a704b Author: Dave Airlie <[email protected]> Date: Wed Jul 31 10:51:03 2013 +1000 nouveau: fix build on ppc by wrapping immintrin include. Signed-off-by: Dave Airlie <[email protected]> diff --git a/src/nouveau_xv.c b/src/nouveau_xv.c index 5569b7c..e19378d 100644 --- a/src/nouveau_xv.c +++ b/src/nouveau_xv.c @@ -25,7 +25,9 @@ #include "config.h" #endif +#ifdef __SSE2__ #include <immintrin.h> +#endif #include "xf86xv.h" #include <X11/extensions/Xv.h> -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
