NEWS | 50 configure.ac | 2 debian/changelog | 22 debian/control | 3 debian/patches/dri3-flush-broken.patch | 82 - debian/patches/series | 2 debian/patches/xmir.patch | 44 debian/upstream.changelog | 2231 +++++++++++++++++++++++++++++++++ src/sna/Makefile.am | 1 src/sna/brw/brw_eu_emit.c | 7 src/sna/debug.h | 44 src/sna/fb/fb.h | 10 src/sna/kgem.c | 4 src/sna/kgem.h | 10 src/sna/sna.h | 16 src/sna/sna_accel.c | 27 src/sna/sna_display.c | 243 ++- src/sna/sna_dri2.c | 64 src/sna/sna_dri3.c | 36 src/sna/sna_driver.c | 11 src/sna/sna_render.c | 6 src/sna/sna_trapezoids.c | 9 src/sna/xassert.h | 10 src/uxa/intel.h | 1 src/uxa/intel_display.c | 5 src/uxa/intel_dri.c | 4 src/uxa/intel_driver.c | 5 tools/virtual.c | 9 28 files changed, 2695 insertions(+), 263 deletions(-)
New commits: commit 6f2c773eba8aec8e2e9896f1edd335bfee5ccb60 Author: Timo Aaltonen <tjaal...@debian.org> Date: Tue Jan 13 14:17:49 2015 +0200 release to vivid diff --git a/debian/changelog b/debian/changelog index ea1e430..ff83a1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-intel (2:2.99.917-1~exp1ubuntu1) vivid; urgency=medium + + * Merge from Debian experimental. + * Drop dri3-flush-broken.patch, upstream + * Refresh xmir patch. + + -- Timo Aaltonen <tjaal...@debian.org> Tue, 13 Jan 2015 12:39:09 +0200 + xserver-xorg-video-intel (2:2.99.917-1~exp2) UNRELEASED; urgency=medium * rules: Fix valgrind-enabling check. diff --git a/debian/patches/dri3-flush-broken.patch b/debian/patches/dri3-flush-broken.patch deleted file mode 100644 index 7abae5c..0000000 --- a/debian/patches/dri3-flush-broken.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- a/src/sna/sna_accel.c -+++ b/src/sna/sna_accel.c -@@ -1408,6 +1408,9 @@ - - __sna_pixmap_free_cpu(sna, priv); - -+ if (priv->flush) -+ sna_accel_watch_flush(sna, -1); -+ - if (priv->header) { - assert(pixmap->drawable.pScreen == sna->scrn->pScreen); - assert(!priv->shm); ---- a/src/sna/sna_dri3.c -+++ b/src/sna/sna_dri3.c -@@ -39,6 +39,8 @@ - #include <misyncshm.h> - #include <misyncstr.h> - -+#define MESA_HAS_NO_FENCES 1 -+ - static DevPrivateKeyRec sna_sync_fence_private_key; - struct sna_sync_fence { - SyncFenceSetTriggeredFunc set_triggered; -@@ -49,6 +51,22 @@ - return dixLookupPrivate(&fence->devPrivates, &sna_sync_fence_private_key); - } - -+static inline void mark_dri3_pixmap(struct sna *sna, struct sna_pixmap *priv, struct kgem_bo *bo) -+{ -+ if (!MESA_HAS_NO_FENCES) -+ return; -+ -+ bo->flush = true; -+ if (bo->exec) -+ sna->kgem.flush = 1; -+ if (bo == priv->gpu_bo) -+ priv->flush |= 3; -+ else -+ priv->shm = true; -+ -+ sna_accel_watch_flush(sna, 1); -+} -+ - static void sna_sync_flush(struct sna *sna, struct sna_pixmap *priv) - { - struct kgem_bo *bo = NULL; -@@ -94,11 +112,13 @@ - DBG(("%s: associated pixmap=%ld\n", __FUNCTION__, get_drawable_pixmap(draw)->drawable.serialNumber)); - sna_sync_flush(sna, sna_pixmap(get_drawable_pixmap(draw))); - } else { /* SyncFence are currently per-screen, sigh */ -- struct sna_pixmap *priv; -+ if (!MESA_HAS_NO_FENCES) { -+ struct sna_pixmap *priv; - -- DBG(("%s: flushing all DRI3 pixmaps\n", __FUNCTION__)); -- list_for_each_entry(priv, &sna->dri3.pixmaps, cow_list) -- sna_sync_flush(sna, priv); -+ DBG(("%s: flushing all DRI3 pixmaps\n", __FUNCTION__)); -+ list_for_each_entry(priv, &sna->dri3.pixmaps, cow_list) -+ sna_sync_flush(sna, priv); -+ } - - sna_accel_flush(sna); - } -@@ -278,6 +298,8 @@ - } - list_add(&priv->cow_list, &sna->dri3.pixmaps); - -+ mark_dri3_pixmap(sna, priv, bo); -+ - return pixmap; - - free_pixmap: -@@ -337,6 +359,8 @@ - priv->pinned |= PIN_DRI3; - list_move(&priv->cow_list, &sna->dri3.pixmaps); - -+ mark_dri3_pixmap(sna, priv, bo); -+ - *stride = (priv->pinned & PIN_DRI3) ? priv->gpu_bo->pitch : priv->cpu_bo->pitch; - *size = kgem_bo_size((priv->pinned & PIN_DRI3) ? priv->gpu_bo : priv->cpu_bo); - DBG(("%s: exporting %s pixmap=%ld, handle=%d, stride=%d, size=%d\n", diff --git a/debian/patches/series b/debian/patches/series index 7fffdd9..99afa45 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ -dri3-flush-broken.patch - # XMir series xmir.patch diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch index f9ecb5a..b32b654 100644 --- a/debian/patches/xmir.patch +++ b/debian/patches/xmir.patch @@ -15,7 +15,7 @@ Date: Wed Jul 24 01:44:30 2013 +0100 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -67,6 +67,7 @@ +@@ -67,6 +67,7 @@ intel_drv_la_SOURCES = \ intel_driver.h \ intel_options.c \ intel_module.c \ @@ -25,8 +25,8 @@ Date: Wed Jul 24 01:44:30 2013 +0100 --- a/src/intel_device.c +++ b/src/intel_device.c -@@ -162,10 +162,23 @@ - return ret; +@@ -410,10 +410,23 @@ static int __intel_open_device__legacy(c + return fd_set_nonblock(drmOpen(NULL, id)); } +static int __intel_open_xmir(const struct pci_device *pci) @@ -47,8 +47,8 @@ Date: Wed Jul 24 01:44:30 2013 +0100 + return __intel_open_xmir(pci); + if (path == NULL) { - char id[20]; - int ret; + if (pci == NULL) + return -1; --- a/src/intel_driver.h +++ b/src/intel_driver.h @@ -1,6 +1,8 @@ @@ -60,9 +60,9 @@ Date: Wed Jul 24 01:44:30 2013 +0100 struct xf86_platform_device; #define INTEL_VERSION 4000 -@@ -134,6 +136,6 @@ - int intel_put_master(ScrnInfoPtr scrn); - void intel_put_device(ScrnInfoPtr scrn); +@@ -141,6 +143,6 @@ void intel_detect_chipset(ScrnInfoPtr sc + default_accel_method__ == x; \ + }) -#define hosted() (0) +#define hosted() (xorgMir) @@ -88,7 +88,7 @@ Date: Wed Jul 24 01:44:30 2013 +0100 +#endif /* INTEL_XMIR_H */ --- a/src/sna/Makefile.am +++ b/src/sna/Makefile.am -@@ -80,6 +80,7 @@ +@@ -81,6 +81,7 @@ libsna_la_SOURCES = \ sna_video_overlay.c \ sna_video_sprite.c \ sna_video_textured.c \ @@ -98,7 +98,7 @@ Date: Wed Jul 24 01:44:30 2013 +0100 gen3_render.c \ --- a/src/sna/sna.h +++ b/src/sna/sna.h -@@ -365,6 +365,7 @@ +@@ -363,6 +363,7 @@ struct sna { EntityInfoPtr pEnt; const struct intel_device_info *info; @@ -106,9 +106,9 @@ Date: Wed Jul 24 01:44:30 2013 +0100 ScreenBlockHandlerProcPtr BlockHandler; ScreenWakeupHandlerProcPtr WakeupHandler; -@@ -1215,4 +1216,18 @@ - #define RR_Rotate_All (RR_Rotate_0 | RR_Rotate_90 | RR_Rotate_180 | RR_Rotate_270) - #define RR_Reflect_All (RR_Reflect_X | RR_Reflect_Y) +@@ -1237,4 +1238,18 @@ static inline void sigtrap_put(void) + extern int getline(char **line, size_t *len, FILE *file); + #endif +/* sna_xmir.c */ + @@ -127,8 +127,8 @@ Date: Wed Jul 24 01:44:30 2013 +0100 #endif /* _SNA_H */ --- a/src/sna/sna_dri2.c +++ b/src/sna/sna_dri2.c -@@ -2873,6 +2873,13 @@ - void sna_dri2_destroy_window(WindowPtr win) { } +@@ -3154,6 +3154,13 @@ void sna_dri2_destroy_window(WindowPtr w + void sna_dri2_decouple_window(WindowPtr win) { } #endif +#if DRI2INFOREC_VERSION >= 8 && XMIR @@ -141,8 +141,8 @@ Date: Wed Jul 24 01:44:30 2013 +0100 static bool has_i830_dri(void) { return access(DRI_DRIVER_PATH "/i830_dri.so", R_OK) == 0; -@@ -3027,6 +3034,13 @@ - info.ReuseBufferNotify = sna_dri2_reuse_buffer; +@@ -3310,6 +3317,13 @@ bool sna_dri2_open(struct sna *sna, Scre + } #endif +#if DRI2INFOREC_VERSION >= 8 && XMIR @@ -157,7 +157,7 @@ Date: Wed Jul 24 01:44:30 2013 +0100 info.scheduleSwap0 = 1; --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c -@@ -548,6 +548,9 @@ +@@ -604,6 +604,9 @@ static Bool sna_pre_init(ScrnInfoPtr scr goto cleanup; } @@ -167,7 +167,7 @@ Date: Wed Jul 24 01:44:30 2013 +0100 /* Sanity check */ if (hosted() && (sna->flags & SNA_IS_HOSTED) == 0) { xf86DrvMsg(scrn->scrnIndex, X_ERROR, -@@ -559,6 +562,7 @@ +@@ -615,6 +618,7 @@ static Bool sna_pre_init(ScrnInfoPtr scr xf86DrvMsg(scrn->scrnIndex, X_PROBED, "CPU: %s\n", sna_cpu_features_to_string(sna->cpu_features, buf)); @@ -175,7 +175,7 @@ Date: Wed Jul 24 01:44:30 2013 +0100 if (!xf86SetDepthBpp(scrn, 24, 0, 0, Support32bppFb | SupportConvert24to32 | PreferConvert24to32)) -@@ -592,6 +596,9 @@ +@@ -648,6 +652,9 @@ static Bool sna_pre_init(ScrnInfoPtr scr sna_setup_capabilities(scrn, fd); @@ -185,7 +185,7 @@ Date: Wed Jul 24 01:44:30 2013 +0100 kgem_init(&sna->kgem, fd, xf86GetPciInfoForEntity(pEnt->index), sna->info->gen); -@@ -710,6 +717,8 @@ +@@ -749,6 +756,8 @@ sna_block_handler(BLOCKHANDLER_ARGS_DECL if (*tv == NULL || ((*tv)->tv_usec | (*tv)->tv_sec) || has_shadow(sna)) sna_accel_block_handler(sna, tv); @@ -194,7 +194,7 @@ Date: Wed Jul 24 01:44:30 2013 +0100 } static void -@@ -1090,6 +1099,8 @@ +@@ -1159,6 +1168,8 @@ sna_screen_init(SCREEN_INIT_ARGS_DECL) if (!miDCInitialize(screen, xf86GetPointerScreenFuncs())) return FALSE; commit a74559f7ef8e169d478af56eff78fe241eb4235c Author: Timo Aaltonen <tjaal...@debian.org> Date: Tue Jan 13 12:38:48 2015 +0200 drop versioned dpkg-dev build-depends, it's obsolete diff --git a/debian/control b/debian/control index 40e123c..ab5fffe 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,6 @@ Build-Depends: libxcb-dri2-0-dev, # end xvmc libudev-dev [linux-any], - dpkg-dev (>= 1.14.17), quilt (>= 0.46-7~), xutils-dev (>= 1:7.5+4), valgrind [amd64 armel armhf i386 mips mipsel powerpc s390x], commit 806aaf6e066227c597fd7514b4c9c679d1f01080 Author: Timo Aaltonen <tjaal...@debian.org> Date: Tue Jan 13 12:34:40 2015 +0200 rules: Fix valgrind-enabling check. diff --git a/debian/changelog b/debian/changelog index 2db9ab1..da3ef87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-intel (2:2.99.917-1~exp2) UNRELEASED; urgency=medium + + * rules: Fix valgrind-enabling check. + + -- Timo Aaltonen <tjaal...@debian.org> Tue, 13 Jan 2015 12:34:17 +0200 + xserver-xorg-video-intel (2:2.99.917-1~exp1) experimental; urgency=medium * New upstream prerelease 2.99.917. diff --git a/debian/rules b/debian/rules index e2161e2..318c14d 100755 --- a/debian/rules +++ b/debian/rules @@ -8,9 +8,9 @@ export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) -ifeq ($(DEB_HOST_ARCH), linux) +ifeq ($(DEB_HOST_ARCH_OS), linux) valgrind = --enable-valgrind else valgrind = --disable-valgrind commit 6ab157f5e48e972c3b915b64ff3783eab1667c28 Author: Vincent Cheng <vch...@debian.org> Date: Sun Dec 21 21:48:45 2014 -0800 upload to experimental diff --git a/debian/changelog b/debian/changelog index 35a2032..2db9ab1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-intel (2:2.99.917-1~exp1) UNRELEASED; urgency=medium +xserver-xorg-video-intel (2:2.99.917-1~exp1) experimental; urgency=medium * New upstream prerelease 2.99.917. * Update upstream changelog. commit dea3553230c4794f677f1365b6890a9ada105b7e Author: Vincent Cheng <vch...@debian.org> Date: Sun Dec 21 21:47:56 2014 -0800 standards version 3.9.6 diff --git a/debian/changelog b/debian/changelog index 3f5324b..35a2032 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-video-intel (2:2.99.917-1~exp1) UNRELEASED; urgency=medium * New upstream prerelease 2.99.917. * Update upstream changelog. + * Update to Standards version 3.9.6. -- Vincent Cheng <vch...@debian.org> Sun, 21 Dec 2014 21:37:27 -0800 diff --git a/debian/control b/debian/control index 4b83ec4..8ec8270 100644 --- a/debian/control +++ b/debian/control @@ -46,7 +46,7 @@ Build-Depends: libxtst-dev, libxrender-dev, libpixman-1-dev, -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-xorg/driver/xserver-xorg-video-intel Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xorg/driver/xserver-xorg-video-intel.git Homepage: http://www.x.org/ diff --git a/debian/patches/series b/debian/patches/series index e69de29..cdafd3f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +# no patches currently applied commit cd1b328e06c4329ff5bad8dceb63eba91b38ce17 Author: Vincent Cheng <vch...@debian.org> Date: Sun Dec 21 21:42:39 2014 -0800 update upstream changelog diff --git a/debian/changelog b/debian/changelog index b894e1f..3f5324b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-intel (2:2.99.917-1~exp1) UNRELEASED; urgency=medium * New upstream prerelease 2.99.917. + * Update upstream changelog. -- Vincent Cheng <vch...@debian.org> Sun, 21 Dec 2014 21:37:27 -0800 diff --git a/debian/upstream.changelog b/debian/upstream.changelog index 8c9991a..697e098 100644 --- a/debian/upstream.changelog +++ b/debian/upstream.changelog @@ -1,3 +1,2234 @@ +commit baec802b21387d04aebb10ac29e719a1800c5aa0 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sun Dec 21 14:41:12 2014 +0000 + + 2.99.917 snapshot + +commit 01ce7efe73538047abd38bbbb95fc4012ebeb9b4 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 20 13:36:50 2014 +0000 + + sna: Fix Drawable offsets prior to performing shadow discard + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit c27e6306e86797553351a71e2917a9b1158ec388 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 20 12:46:52 2014 +0000 + + sna/dri2: Check for implicit flushing after updating a Pixmap buffer + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 5c16a4ec9b59123336483238ee6017db5491e255 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sat Dec 20 09:38:41 2014 +0000 + + sna: Skip allocation of new TearFree buffer if not actually flipping + + After showing the new front buffer, we have to avoid writing to the back + buffer whilst the flip is still pending (as it may still be being shown + by the display). To do this we check if there are any outstanding flips, + and reallocate if so. However, with a CRTC override, we may just be + flipping that one CRTC and not the current TearFree back buffer and in + that case we can avoid the reallocation. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 9b3b591476cc52cc285a8a1f02462db37d5e10c2 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 19 12:25:30 2014 +0000 + + sna/dri2: Preserve the shadow CRTCs when copying to other areas + + In the Composite setup, if we are doing a DRI2 copy onto the front + buffer, we are fully cognizant that the copy will not go onto the + unredirected Windows of another Client. So we can preserve the shadow + CRTC mapping for those Clients, and prevent ping-ponging between CRTC + modes. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 391b50c81decd208c47c109217b2c882c064ac69 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 19 11:11:38 2014 +0000 + + sna/dri2: Report changes in pitch when swapping bo + + As we have relaxed the pitch restriction between front/back buffers when + swapping, we need to make sure that any change is also reported back + along with the change in front/back names. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit ada97d27250aa09b1a27d5f6640fea011fade997 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 19 09:43:33 2014 +0000 + + sna/dri2: Look for preferred CRTC for visible portion of the window + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 6f99bbe67e6e70d5b24611c7afa0dffc5632aaab +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 19 08:37:07 2014 +0000 + + sna/dri2: Prevent NULL pointer dereference of Window private + + In case we receive quick successive calls to DRI2GetBuffers on the same + Window, we need to check that the private exists before dereferencing + it. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit fdd7508e53043f82f9cf422fc968c6574334a667 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 19 07:59:24 2014 +0000 + + sna/dri2: Decouple Window cache on Pixmap changes + + If the Pixmap for a Window is changed (i.e. Composite + redirection/unredirection), we also need to decouple any associated DRI2 + front buffer for the Pixmap (e.g. used for single CRTC flipping). + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 82e480267079f8678245e37724f95ae87f55b582 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 17 08:01:00 2014 +0000 + + intel-virtual-output: Do not attempt to tidy up the local display if it fails + + Just fix the segfault dereferencing the primary display if we bail + during its setup. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit c211b3bc61efa7d13a5f5f1276649d90bf4ef854 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Dec 17 07:51:31 2014 +0000 + + intel-virtual-output: Add version number to verbose output + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 123754de41380b94922768d021987b1dea3b39c4 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 16 10:31:22 2014 +0000 + + sna: Make error debug tracing available at normal debug levels + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 99537089346ed7a1bc6b02349fad93845e865bb9 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 12 15:36:25 2014 +0000 + + sna: Tune handling of kernel error detection during intial setup + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 01692b8cf229f45813cf3a1059577a779d71dfa8 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 12 15:13:04 2014 +0000 + + sna: Fix TearFree multi-monitor operation whilst wedged + + The crtc flip (for when the kernel can't do a pageflip) made the mistake + of setting the shadow buffer to the scanout - nullifying the effect of + the TearFree. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 343299c78bfc1044da0b965e99de9ad312b05cca +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 12 09:40:51 2014 +0000 + + sna/trapezoids: Check the pixmap is wrapped before deferencing it + + When we AddTraps to a low resolution bitmap, we need to fallback as we + don't wrap it with a GPU pixmap. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 60ebac591596ccb768b684b1909064570dd1cf47 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Dec 12 07:55:51 2014 +0000 + + sna: Add another Xinerama vs RandR guard + + Another place used rrScrPriv without checking for its validity. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87257 + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f587d71f3c91f9ddcc4cdbe8a0f9ce59590d9db2 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 11 08:53:54 2014 +0000 + + sna: Catch NULL RandR screen private + + If Xinerama is enabled, than RandR12 will be silently disabled. Be + careful not to dereference the rrScrPiv when it doesn't exist. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87207 + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 04a09d353fc5ad8a55eb2457dc8bb43638ba879e +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 9 20:43:52 2014 +0000 + + uxa/dri: Remove defunct intel->back_pixmap + + This was only required for glamor support. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 08ee9a75df16ee276835df5fc613648db2566154 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Dec 9 20:40:20 2014 +0000 + + uxa/dri: Fix triple buffer swapping + + Fixes regression from + + commit 0aa2edbd29c8dd26a5f3748e3875c445ea358a6d + Author: Chris Wilson <ch...@chris-wilson.co.uk> + Date: Wed Nov 5 11:56:20 2014 +0000 + + Remove defunct glamor support + + where the wrong branch of pixmap exchange upon SwapBuffers was kept when + removing the glamor paths. + + Reported-by: Rui Matos + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit fc984e8953d61901b255422c8f56eb79a2dd2a28 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Jul 22 08:38:42 2014 +0100 + + sna/dri3: Mesa relies upon implicit fences for X/Compositor synchronisation + + The decision has been made that DRI3/intel shall continue with DRI2-style + implicit fencing for synchronisation between X and clients using pixmaps + as texture sources. (The other way around uses explicit fencing!) + + References: https://bugs.freedesktop.org/show_bug.cgi?id=81551 + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit d247cb7d0cdb73736f31612157e47f166af68ba0 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 8 10:07:25 2014 +0000 + + sna/gen6: Poke PSMI control around WAIT_FOR_EVENT to prevent idling + + The bspec recommends preventing the hardware from going to sleep around + a WAIT_FOR_EVENT, and tells us to use disable sleep bit in PSMI control + to accomplish this. + + References: https://bugs.freedesktop.org/show_bug.cgi?id=62373 + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit d39dc73a80161d290555877942e5990daf0c0411 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 8 08:33:11 2014 +0000 + + sna: Inline check for pending events before reading from drm fd + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f8aecdffada438306dff8923cdfc0df527509672 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 4 11:23:11 2014 +0000 + + sna: Clear the read flags for the shared drm fd after use + + In ZaphodHeads, we may reuse the same select read flags and attempt to + read from a blocking drm fd multiple times. However, if we clear the + read flags after first exhausting the fd, we shouldn't then block on + subsequent heads. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 594470c809627feab4891bade5ec6d80e1d0a919 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Dec 4 11:16:58 2014 +0000 + + sna: Update the fence marker after submitting a new batch + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 9c2c485df9fd39ae36779f765a892e36835a8001 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 1 14:26:46 2014 +0000 + + sna: Validate that the reg/insn size is well defined + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 263d10998617ba935179942d2440a1607cd3c21c +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 1 13:26:46 2014 +0000 + + sna: Clamp downsampling tile size + + For very large scale factors, it is possible for the current calculation + to underflow and try negative tile sizes. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 88e9bb760fbd1249bb364a6b68aceee0b442738c +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 1 10:47:32 2014 +0000 + + sna: Explicitly disable unused pipes after an output reconfiguration + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit ddf5feba786cf0147c4db9720c96e9a5636573b0 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 1 10:00:32 2014 +0000 + + sna: Generate a backtrace on assertion failures + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit e12ec452a99396f76138a5961c8195e22ca12ac1 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 1 09:46:20 2014 +0000 + + sna: Cancel pending mode change notification + + Along a couple of paths, we either do not care about the notification + (i.e. during suspend) or do it explicitly. There we should mark the work + as done. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 700c036d180a09e4f7ec30466f7f6dda1c1d0066 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 1 09:31:41 2014 +0000 + + sna: Reject modesets with 0 outputs + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit dd421005cac981e75f734d50263675521943ed7b +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 1 09:29:07 2014 +0000 + + sna: Add a few more asserts to sna_crtc_flip() + + Check that we are updating an active CRTC with a valid mode and + associated outputs. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 104517507f267aca7433f8b85dec89e9013a640e +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 1 09:24:50 2014 +0000 + + sna: Do not post shadow updates in the middle of output reconfiguration + + Wait until the screens and framebuffers settle before we start updating. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit faef6e5e1ab52819d4e9a19738ec7d8419841613 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 1 08:29:47 2014 +0000 + + sna: Clean up DBG compile warnings + + Including a potential crash due to using a unspecified string, oops. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 0bec625cc45eb8de85a5013506cce5f789dc8e45 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Dec 1 08:11:18 2014 +0000 + + sna: Report when we disable TearFree due to an error in operation + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 6059b51b59537682b3d9c64c69ea72616462c41c +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Nov 28 07:33:42 2014 +0000 + + sna: Reject attempts to set an invalid mode + + Let's be sure the mode has been established before we attempt to apply + it to a CRTC - just in case the kernel tries to use the invalid mode and + blows up. + + References: https://bugs.freedesktop.org/show_bug.cgi?id=86679 + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 0f15b8b45bb6de10ce1926db303247a5bd3c1c08 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Nov 19 18:42:32 2014 +0000 + + sna/transform: Correctly check for imprecise fractional translations + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 7725c423cda217e0dbd95003bb7a80b4b3a73bb4 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Nov 19 18:30:20 2014 +0000 + + sna/dri2: Improve precision of completion event for no-op swaps + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f367f3dee5e2ecba265a8ff7e98e196189793613 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Nov 19 18:19:13 2014 +0000 + + sna/dri2: Add more DBG to explain invalid frames + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 05a1aba1ab5d288918d6689080170fc83a80db61 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Nov 19 18:12:10 2014 +0000 + + sna: DBG compile fix + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit a90cc3b3889fafbd91c11c42d068a9d6474e218b +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Nov 18 08:37:25 2014 +0000 + + sna: Tweak alignment constraints on gen8 to allow BLT + + The previous commits prevent us from using the BLT if the destination + address is misaligned. Honour that restriction when creating buffers as + well, so that they are always usuable by the BLT. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 8dee52997891108eec8e4df12dd02f3a060d9cb8 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Nov 19 13:38:20 2014 +0000 + + sna: Add more checks and asserts for BLT capable bo + + Before we use the BLT for core acceleration, double check that we can. + This should catch the case where we attempt to operate on SHM pixmaps + which do not meet the restrictions. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 3a22b6f6d55a5b1e0a1c0a3d597996268ed439ad +Author: Mika Kuoppala <mika.kuopp...@linux.intel.com> +Date: Wed Nov 19 15:10:05 2014 +0200 + + sna: gen8 BLT broken when address has bit 4 set + + With bit 4 set in address, the gen8 blitter fails and blits errorneously + into the cacheline preceeding the destination and similarly when reading from + the source, corrupting memory. + + v2: Update the destination base offset pattern as revealed + by igt/tests/gem_userptr_blits/destination-bo-align + + v3: Check base address as well + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79053 + Cc: Chris Wilson <ch...@chris-wilson.co.uk> + Tested-by: xunx.f...@intel.com [v2] + Signed-off-by: Mika Kuoppala <mika.kuopp...@intel.com> + +commit 29aab766f4b59c71181875880c8c943b93008bdf +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Tue Nov 18 20:54:39 2014 +0000 + + sna/dri2: Remove unused function + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit b6eeb7a1f7efa591504070b606be655e27e6e9c2 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Nov 5 13:03:41 2014 +0000 + + Disable DRI3 by default + + The external libraries, both in git, and especially shipping already + enabled in distributions, are buggy and lead to server crashes and + lockups. Caveat emptor. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 6c2707d7bbc0ebb422be66618b6f78887c46446e +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Thu Nov 13 08:37:13 2014 +0000 + + sna: Unroll pwrite using our cached mmappings + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit f9f85b88032b2458d4d24ceca450fdaa65e6b94d +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Nov 12 11:50:33 2014 +0000 + + sna: Reorder PARAMs based on upstream inclusion + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 13fa1f1a26aed83cd8fccafb9a0bdb096f69534b +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Nov 12 10:54:36 2014 +0000 + + sna/gen7: Be paranoid and force a pipecontrol stall at least every 4 flushes + + The documentation warns of potential GPU hangs if we emit more than 4 + pipecontrol flushes without a CS stall. This is highly unlikely given + how frequently we must inject stalls into the pipeline, but force a + stall just in case! + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit b2492fa45beaf3c676eea2d5d75e35d60b91d769 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Nov 10 13:30:15 2014 +0000 + + sna: Only reshow unhidden cursors after modesetting + + Reported-by: Maarten Lankhorst <maarten.lankho...@canonical.com> + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 0267f5902ddaceced870dcd8451ef8729e33e5c2 +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Mon Nov 10 07:42:42 2014 +0000 + + sna: Check after filtering points before submitting boxes to be drawn + + As we clip the points when converting them into GPU boxes, check that we + have something to draw before submitting the commands. + + Reported-by: Ian Gay <g...@sfu.ca> + References: https://bugs.freedesktop.org/show_bug.cgi?id=86075 + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 9ea242c275a70351abcfbc0f8f3233c122abecbe +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Sun Nov 9 08:59:08 2014 +0000 + + sna: Check picture format on destination before beginning a GPU operation + + This is more important in the multiple stage operations like glyph + rendering where we do not want to initiate an operation on the GPU only + then to fallback due to an incompatible destination. + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit e96520327bd2ef4fbc7b7b5169a17b966d9f85f3 +Author: Sedat Dilek <sedat.di...@gmail.com> +Date: Fri Nov 7 10:54:18 2014 +0100 + + sna: wc-mmap: Fix warning in configure + + This fixes the following warning due to a typo: + + configure: WARNING: unrecognized options: --enable-wc-map + Signed-off-by: Sedat Dilek <sedat.di...@gmail.com> + +commit ab6680375cc6d5efebe8e40816d1906b15678d6e +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Nov 7 09:54:35 2014 +0000 + + sna/xv: Give the illusion of hardware progress + + The number of ports we provide for Xv textured video is arbitrary. The + main cost is reservation of a number of XIDs and preallocation of a + block of memory. Whatever value we pick, someone will always want + more... + + References: https://bugs.freedesktop.org/show_bug.cgi?id=85974 + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 0aa2edbd29c8dd26a5f3748e3875c445ea358a6d +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Wed Nov 5 11:56:20 2014 +0000 + + Remove defunct glamor support + + It never was a stable or complete replacement, and now it is + incorporated in Xorg itself! + + Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> + +commit 4281bbdd5be1f846c217cdf6d09536779cd324ce +Author: Chris Wilson <ch...@chris-wilson.co.uk> +Date: Fri Oct 24 08:50:55 2014 +0100 + + sna: Fix debug mmapping of active + released aux buffers + -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1yb11m-0001tc...@moszumanska.debian.org