xorg-server: Changes to 'upstream-experimental'
Xi/devbell.c |3
Xi/exevents.c | 42 +-
Xi/extinit.c | 36 -
Xi/xigrabdev.c | 15 +++
configure.ac | 14 ++-
dix/devices.c |7 +
dix/eventconvert.c | 23 ++---
dix/getevents.c| 15 ++-
dix/touch.c|4 -
glx/glxdri.c |2
glx/glxdri2.c |2
hw/kdrive/ephyr/ephyr.c|6 -
hw/kdrive/ephyr/hostx.c|6 +
hw/kdrive/ephyr/hostx.h|3
hw/xfree86/common/xf86.h |1
hw/xfree86/common/xf86Events.c | 17
hw/xfree86/common/xf86Init.c |2
hw/xfree86/common/xf86Xinput.c |2
hw/xfree86/common/xf86platformBus.c| 19
hw/xfree86/common/xf86platformBus.h|4 +
hw/xfree86/modes/xf86Crtc.c|5 -
hw/xfree86/os-support/linux/lnx_platform.c | 48 ++--
hw/xfree86/os-support/solaris/sun_init.c |2
hw/xfree86/os-support/xf86_OSproc.h|3
include/dixstruct.h|2
include/eventstr.h |1
include/hotplug.h |1
os/io.c|1
os/log.c | 115 ++---
test/signal-logging.c | 95 +--
xkb/xkbInit.c |3
31 files changed, 393 insertions(+), 106 deletions(-)
New commits:
commit 2767d9a17d62aede7cabac589c3388078bdb6022
Author: Matt Dew
Date: Tue Jun 25 09:49:08 2013 -0600
Bump rev from 1.14.1.902 to 1.14.2
diff --git a/configure.ac b/configure.ac
index b977b54..99e3cd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.1.902,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2013-06-13"
-RELEASE_NAME="Act rc2-Normal"
+AC_INIT([xorg-server], 1.14.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2013-06-25"
+RELEASE_NAME="Act Abnormal"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 7dec1d38799d82923e3241f73c83aa1ad357f72b
Author: Matt Dew
Date: Fri Jun 21 10:24:16 2013 -0600
Revert "dix: pre-scale x by the screen:device:resolution ratio"
This reverts commit 14d89b9a466b521b985bc95fc4994637367362a8.
diff --git a/dix/getevents.c b/dix/getevents.c
index 51d4fd4..dfe4652 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -770,29 +770,6 @@ add_to_scroll_valuator(DeviceIntPtr dev, ValuatorMask
*mask, int valuator, doubl
}
-static void
-scale_for_device_resolution(DeviceIntPtr dev, ValuatorMask *mask)
-{
-double x;
-ValuatorClassPtr v = dev->valuator;
-int xrange = v->axes[0].max_value - v->axes[0].min_value + 1;
-int yrange = v->axes[1].max_value - v->axes[1].min_value + 1;
-
-double screen_ratio = 1.0 * screenInfo.width/screenInfo.height;
-double device_ratio = 1.0 * xrange/yrange;
-double resolution_ratio = 1.0;
-double ratio;
-
-if (!valuator_mask_fetch_double(mask, 0, &x))
-return;
-
-if (v->axes[0].resolution != 0 && v->axes[1].resolution != 0)
-resolution_ratio = 1.0 * v->axes[0].resolution/v->axes[1].resolution;
-
-ratio = device_ratio/resolution_ratio/screen_ratio;
-valuator_mask_set_double(mask, 0, x * ratio);
-}
-
/**
* Move the device's pointer by the values given in @valuators.
*
@@ -804,14 +781,27 @@ moveRelative(DeviceIntPtr dev, int flags, ValuatorMask
*mask)
{
int i;
Bool clip_xy = IsMaster(dev) || !IsFloating(dev);
-ValuatorClassPtr v = dev->valuator;
/* for abs devices in relative mode, we've just scaled wrong, since we
mapped the device's shape into the screen shape. Undo this. */
-if ((flags & POINTER_ABSOLUTE) == 0 && v && v->numAxes > 1 &&
-v->axes[0].min_value < v->axes[0].max_value &&
-v->axes[1].min_value < v->axes[1].max_value) {
-scale_for_device_resolution(dev, mask);
+if ((flags & POINTER_ABSOLUTE) == 0 && dev->valuator &&
+dev->valuator->axes[0].min_value < dev->valuator->axes[0].max_value) {
+
+double ratio = 1.0 * screenInfo.width/screenInfo.height;
+
+if (ratio > 1.0) {
+double y;
+if (valuator_mask_fetch_double(mask, 1, &y)) {
+y *= ratio;
+valuator_mask_set_double(mask, 1, y);
+}
+} else {
+double x;
+if (valuator_mask_fetch_double(mask, 0, &x)) {
+x *=
xorg-server: Changes to 'ubuntu'
ChangeLog | 476 +
Xi/devbell.c |3
Xi/exevents.c | 42 +-
Xi/extinit.c | 36 +-
Xi/xigrabdev.c | 15
configure.ac | 14
debian/changelog | 60 ++-
debian/patches/series |1
debian/patches/xf86setdesired-hybrid.patch | 44 --
dix/devices.c |7
dix/eventconvert.c | 23 -
dix/getevents.c| 15
dix/touch.c|4
glx/glxdri.c |2
glx/glxdri2.c |2
hw/kdrive/ephyr/ephyr.c|6
hw/kdrive/ephyr/hostx.c|6
hw/kdrive/ephyr/hostx.h|3
hw/xfree86/common/xf86.h |1
hw/xfree86/common/xf86Events.c | 17 -
hw/xfree86/common/xf86Init.c |2
hw/xfree86/common/xf86Xinput.c |2
hw/xfree86/common/xf86platformBus.c| 19 +
hw/xfree86/common/xf86platformBus.h|4
hw/xfree86/modes/xf86Crtc.c|5
hw/xfree86/os-support/linux/lnx_platform.c | 48 ++
hw/xfree86/os-support/solaris/sun_init.c |2
hw/xfree86/os-support/xf86_OSproc.h|3
include/dixstruct.h|2
include/eventstr.h |1
include/hotplug.h |1
os/io.c|1
os/log.c | 115 ++-
test/signal-logging.c | 95 +
xkb/xkbInit.c |3
35 files changed, 903 insertions(+), 177 deletions(-)
New commits:
commit 8f2e389dd5b6fa6bc1e623f175b72f0d3674d4f8
Author: Maarten Lankhorst
Date: Tue Jul 16 09:39:35 2013 +0200
New upstream release. (LP: #1156498)
Remove upstreamed patch.
- xf86setdesired-hybrid.patch
diff --git a/debian/changelog b/debian/changelog
index e4224df..cdc07ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.14.2-0ubuntu1) saucy; urgency=low
+
+ * New upstream release. (LP: #1156498)
+ * Remove upstreamed patch.
+- xf86setdesired-hybrid.patch
+
+ -- Maarten Lankhorst Tue, 16 Jul 2013
09:36:06 +0200
+
xorg-server (2:1.14.2-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
diff --git a/debian/patches/series b/debian/patches/series
index 0606467..22b1497 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,7 +19,6 @@
xfree86-no-xv-for-gpuscreens.patch
xephyr-glx-register.patch
no-nv.patch
-xf86setdesired-hybrid.patch
## waiting for review by upstream
111_armel-drv-fallbacks.patch
diff --git a/debian/patches/xf86setdesired-hybrid.patch
b/debian/patches/xf86setdesired-hybrid.patch
deleted file mode 100644
index 037556e..000
--- a/debian/patches/xf86setdesired-hybrid.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Subject: [PATCH] hw/xfree86: Allow xf86SetDesiredModes to succeed if no crtc's
are enabled.
-From: Maarten Lankhorst
-
-Fixes regression on xserver 1.14 introduced by 6703a7c7cf1a.
-"hw/xfree86: Require only one working CRTC to start the server."
-
-https://bugs.freedesktop.org/show_bug.cgi?id=62916
-
-Without any crtc's enabled, 1.13 worked correctly, but the logic in
-xf86SetDesiredModes will now return false instead. Fix this to
-return success if all outputs were already disabled.
-
-Signed-off-by: Maarten Lankhorst
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index f9ae465..eb72f0e 100644
a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -2599,7 +2599,7 @@ xf86SetDesiredModes(ScrnInfoPtr scrn)
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
- xf86CrtcPtr crtc = config->crtc[0];
- int c;
--int enabled = 0;
-+int enabled = 0, failed = 0;
-
- /* A driver with this hook will take care of this */
- if (!crtc->funcs->set_mode_major) {
-@@ -2659,11 +2659,12 @@ xf86SetDesiredModes(ScrnInfoPtr scrn)
- if (config->output[o]->crtc == crtc)
- config->output[o]->crtc = NULL;
- crtc->enabled = FALSE;
-- }
-+failed++;
-+}
- }
-
- xf86DisableUnusedFunctions(scrn);
--return enabled != 0;
-+return enabled != 0 || !failed;
- }
-
- /**
-
-
commit f0b7e86a782cf763a9ce629892afeb4f487163e8
Author: Maarten Lankhorst
Date: Tue Jul 16 09:34:42 2013 +0200
bump changelogs
diff --git a/ChangeLog b/ChangeLog
index eda3cd5..3ce76d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,479 @@
+commit 2767d9a17d62aede7cabac589c3388078bdb6022
+Author: Matt Dew
+Date: Tue Jun 25 09:49:08 2013 -0600
+
+Bump rev from 1.14.
xorg-server: Changes to 'debian-experimental'
ChangeLog | 476 + Xi/devbell.c |3 Xi/exevents.c | 42 +- Xi/extinit.c | 36 +- Xi/xigrabdev.c | 15 configure.ac | 14 debian/changelog |2 dix/devices.c |7 dix/eventconvert.c | 23 - dix/getevents.c| 15 dix/touch.c|4 glx/glxdri.c |2 glx/glxdri2.c |2 hw/kdrive/ephyr/ephyr.c|6 hw/kdrive/ephyr/hostx.c|6 hw/kdrive/ephyr/hostx.h|3 hw/xfree86/common/xf86.h |1 hw/xfree86/common/xf86Events.c | 17 - hw/xfree86/common/xf86Init.c |2 hw/xfree86/common/xf86Xinput.c |2 hw/xfree86/common/xf86platformBus.c| 19 + hw/xfree86/common/xf86platformBus.h|4 hw/xfree86/modes/xf86Crtc.c|5 hw/xfree86/os-support/linux/lnx_platform.c | 48 ++ hw/xfree86/os-support/solaris/sun_init.c |2 hw/xfree86/os-support/xf86_OSproc.h|3 include/dixstruct.h|2 include/eventstr.h |1 include/hotplug.h |1 os/io.c|1 os/log.c | 115 ++- test/signal-logging.c | 95 + xkb/xkbInit.c |3 33 files changed, 870 insertions(+), 107 deletions(-) New commits: commit f0b7e86a782cf763a9ce629892afeb4f487163e8 Author: Maarten Lankhorst Date: Tue Jul 16 09:34:42 2013 +0200 bump changelogs diff --git a/ChangeLog b/ChangeLog index eda3cd5..3ce76d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,479 @@ +commit 2767d9a17d62aede7cabac589c3388078bdb6022 +Author: Matt Dew +Date: Tue Jun 25 09:49:08 2013 -0600 + +Bump rev from 1.14.1.902 to 1.14.2 + +commit 7dec1d38799d82923e3241f73c83aa1ad357f72b +Author: Matt Dew +Date: Fri Jun 21 10:24:16 2013 -0600 + +Revert "dix: pre-scale x by the screen:device:resolution ratio" + +This reverts commit 14d89b9a466b521b985bc95fc4994637367362a8. + +commit 187cb5a037a03ab1e7702da5eebb2e7d884c6186 +Author: Alan Coopersmith +Date: Wed Apr 24 15:24:31 2013 -0700 + +Only call xf86platformVTProbe() when it's defined + +Fixes build on non-udev systems, since XSERVER_PLATFORM_BUS is only +defined in configure.ac if $CONFIG_UDEV_KMS is true. + +Signed-off-by: Alan Coopersmith +Reviewed-by: Dave Airlie + +commit 34259752340e287333fb03f3060c6db13d72f868 +Author: Matt Dew +Date: Thu Jun 13 16:25:26 2013 -0600 + +Bump rev from 1.14.1.901 to 1.14.1.902 + +commit 31e066546fd085725cc29e95867a04c70ce46ebc +Author: Peter Hutterer +Date: Fri Apr 26 15:10:08 2013 +1000 + +dix: fix device scaling to use a [min,max[ range. + +defmin/defmax are screen coords and thus use a min-inclusive, max-exclusive +range. device axes ranges are inclusive, so bump the max up by one to get the +scaling right. + +This fixes off-by-one coordinate errors if the coordinate matrix is used to +bind the device to a fraction of the screen. It introduces an off-by-one +scaling error in the device coordinate range, but since most devices have a +higher resolution than the screen (e.g. a Wacom I4 has 5080 dpi) the effect +of this should be limited. + +This error manifests when we have numScreens > 1, as the scaling from +desktop size back to screen size drops one device unit. + +Signed-off-by: Peter Hutterer +(cherry picked from commit 756ab88d93542f0589c9bf46f40ccc57df64f0fd) + +commit 14d89b9a466b521b985bc95fc4994637367362a8 +Author: Peter Hutterer +Date: Sat Mar 9 20:43:51 2013 +1000 + +dix: pre-scale x by the screen:device:resolution ratio + +commit 61a99aff9d33728a0b67920254d2d4d79f80cf39 +dix: pre-scale relative events from abs devices to desktop ratio (#31636) + +added pre-scaling of relative coordinates coming from absolute devices to +undo uneven scaling based on the screen dimensions. + +Devices have their own device width/height ratio as well (in a specific +resolution) and this must be applied for relative devices as well to avoid +scaling of the relative events into the device's ratio. + +e.g. a Wacom Intuos4 6x9 is in 16:10 format with equal horiz/vert +resolution (dpi). A movement by 1000/1000 coordinates is a perfect diagonal +on the tablet and must be reflected as such on the screen. + +However, we map the relative device-coordinate events to absolut
Re: Bug#717054: gdm3: greeter garbles up screen, no input possible, cannot even switch to tty
Thanks for your quick reply. Unfortunately I am not at the machine in question at the moment, but I am writing to say that I did try disabling GDM and using xinit and that I did get the exact same errors, so reassignmet seems a good idea, I just cannot tell to which package. BTW, as there is no X configuration file anymore, how can I test different X modules and settings, resolutions &c.? On Tue, 16 Jul 2013, Simon McVittie wrote: Please attach the output of "reportbug --template /usr/lib/xorg/modules/drivers/r128_drv.so", which should contain information on X and the R128 driver. Sorry. That machine is far away from my place, I was just trying to help some friends. I'll try things as soon as I can. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/alpine.DEB.2.02.1307161713570.5187@bamboo.clematis
Processed: Re: Bug#717054: gdm3: greeter garbles up screen, no input possible, cannot even switch to tty
Processing commands for cont...@bugs.debian.org: > reassign 717054 xserver-xorg-video-r128 Bug #717054 [gdm3] gdm3: greeter garbles up screen, no input possible, cannot even switch to tty Bug reassigned from package 'gdm3' to 'xserver-xorg-video-r128'. No longer marked as found in versions gdm3/3.4.1-8. Ignoring request to alter fixed versions of bug #717054 to the same values previously set > retitle 717054 garbled screen & "Idle timed out, resetting engine" loop Bug #717054 [xserver-xorg-video-r128] gdm3: greeter garbles up screen, no input possible, cannot even switch to tty Changed Bug title to 'garbled screen & "Idle timed out, resetting engine" loop' from 'gdm3: greeter garbles up screen, no input possible, cannot even switch to tty' > tags 717054 + moreinfo Bug #717054 [xserver-xorg-video-r128] garbled screen & "Idle timed out, resetting engine" loop Added tag(s) moreinfo. > thanks Stopping processing here. Please contact me if you need assistance. -- 717054: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=717054 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.137408182123993.transcr...@bugs.debian.org
Re: Bug#717054: gdm3: greeter garbles up screen, no input possible, cannot even switch to tty
reassign 717054 xserver-xorg-video-r128 retitle 717054 garbled screen & "Idle timed out, resetting engine" loop tags 717054 + moreinfo thanks On 16/07/13 16:21, a...@users.sourceforge.net wrote: > I am writing to say that I did try disabling GDM and using > xinit and that I > did get the exact same errors, so reassignmet seems a good idea, I just > cannot tell to which package. I don't know either, but xserver-xorg-video-r128 is probably a good guess, so I'm doing that. > BTW, as there is no X configuration file anymore, how can I test > different X modules and settings, resolutions &c.? You can create one if you need to, see xorg.conf(5). >> Please attach the output of "reportbug --template >> /usr/lib/xorg/modules/drivers/r128_drv.so", which should contain >> information on X and the R128 driver. > > Sorry. That machine is far away from my place, I was just trying to help > some friends. I'll try things as soon as I can. Unfortunately, I doubt the X maintainers are going to be able to help much until they have that information. I've tagged the bug "more information required". S -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/51e6d318.5060...@debian.org
xserver-xorg-video-intel: Changes to 'debian-experimental'
ChangeLog | 599 + NEWS | 51 +++ configure.ac | 14 - debian/changelog |2 man/intel.man | 13 src/intel_device.c | 58 +++- src/intel_driver.c |5 src/intel_list.h |2 src/intel_module.c | 56 src/intel_options.c|2 src/intel_options.h|2 src/sna/compiler.h |4 src/sna/gen2_render.c | 26 + src/sna/gen3_render.c |9 src/sna/gen4_render.c | 57 +++- src/sna/gen5_render.c | 26 + src/sna/gen6_render.c | 16 - src/sna/gen7_render.c | 16 - src/sna/kgem.c | 250 +++--- src/sna/kgem.h |9 src/sna/sna.h |7 src/sna/sna_accel.c| 232 - src/sna/sna_blt.c | 73 +++-- src/sna/sna_composite.c|6 src/sna/sna_damage.c | 46 +-- src/sna/sna_display.c | 343 - src/sna/sna_display_fake.c | 59 src/sna/sna_dri.c |4 src/sna/sna_driver.c | 30 -- src/sna/sna_glyphs.c |3 src/sna/sna_io.c | 238 ++--- src/sna/sna_render.c |6 src/sna/sna_render.h |3 src/sna/sna_tiling.c | 45 +-- 34 files changed, 1646 insertions(+), 666 deletions(-) New commits: commit b8b686d1502fdad83896f86cc2affa46e56e6c5e Author: Maarten Lankhorst Date: Wed Jul 17 12:08:28 2013 +0200 bump changelogs, new upstream release diff --git a/ChangeLog b/ChangeLog index 9c05cdc..c82650d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,602 @@ +commit e83e7e60f41cb29132d5eef60af16b65b1b3cd4e +Author: Chris Wilson +Date: Sun Jul 14 09:31:39 2013 +0100 + +2.21.12 release + +commit 0230ef72cbb2d3bcf7157548ddd52a71c0c771c5 +Author: Chris Wilson +Date: Fri Jul 12 23:57:42 2013 +0100 + +sna: Skip copying to the intermediate target if we will completely overwrite it + +Occasionally when forced to use an intermediate destination surface, we +know that we will completely overwrite the contents of the surface and +so we can forgo the initial copy from the target. + +Signed-off-by: Chris Wilson + +commit 2b16eaefb38b4a6efe50a397e68793ab9a1cb2ef +Author: Chris Wilson +Date: Fri Jul 12 23:22:59 2013 +0100 + +sna: Avoid integer overflow when computing the tiled extents + +When stepping over the tiles, beware that the step may overflow the +int16_t region extents, so use an int for the calculation. + +Reported-by: Andrew Woodward +Bugzilla: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1200766 +Signed-off-by: Chris Wilson + +commit 835ceccb27afa18704c34dc3283476340f999317 +Author: Chris Wilson +Date: Fri Jul 12 23:20:56 2013 +0100 + +sna/gen5: Add some more DBG + +Signed-off-by: Chris Wilson + +commit 39f1954f667bf20cd0c25dfa5fb5267a3f9eb113 +Author: Chris Wilson +Date: Thu Jul 11 21:57:02 2013 +0100 + +sna: Replace parsing of /proc/cpuinfo with parsing of cpuid + +Courtesy of a patch from Chad Versace via Ben Widawsky, actually digging +through CPUID for the cache info looks quite easy in comparison to the +fragile approach of parsing a linux specific file that may or may not be +available. + +Signed-off-by: Chris Wilson + +commit c604d1426cc11f9799044710acf1ef7d226d2604 +Author: Chris Wilson +Date: Thu Jul 11 16:40:51 2013 +0100 + +sna: Remove the duplicated open-coding of SetScreenPixmap + +Signed-off-by: Chris Wilson + +commit 07926bfe507071a3d46a2ec13bb86a36bc225761 +Author: Chris Wilson +Date: Thu Jul 11 15:28:55 2013 +0100 + +sna: Remove the temporary region allocation from sna_do_copy + +Signed-off-by: Chris Wilson + +commit 519d0007d4add23b14b5a9fd83cf4a1b68c63d03 +Author: Chris Wilson +Date: Wed Jul 10 18:24:36 2013 +0100 + +sna: Remove incorrect asserts for checking CPU mappings (after remapping) + +These assertions were checking that the previous state prior to +performing the new mapping was consistent. Given that the checks were +occurring after the update in mapping, the asserts were bogus. + +Signed-off-by: Chris Wilson + +commit a18f4ba9033cec3cc435c29878b12ceef1defc1f +Author: Chris Wilson +Date: Wed Jul 10 11:56:50 2013 +0100 + +sna: Ofast was introduced with gcc-4.6 + +Thomas Jones reported that the build was failing with gcc-4.5 due to the +memcpy routines requesting an unsupported optimisation mode (-Ofast) and +supplied this patch to only enable Ofast for gcc-4.6+ + +Reported-by: Thomas Jones +Signed-off-by: Chris Wilson + +commit ccf0fdd56dc6efd30e425209d753ed4f90562d76 +Author: Chris Wilson +Date: Tue Jul 9 20:41:51 2013 +0100 + +sna: Only flush after the BLT operation if we have more
xserver-xorg-video-intel: Changes to 'ubuntu'
ChangeLog | 1898 ++ NEWS| 131 configure.ac| 21 debian/changelog| 30 debian/control |2 debian/patches/0002-Update-manpage-for-new-accelmethod-option.patch | 15 debian/patches/series |3 debian/patches/sna-make-sure-the-source-is-coherent.diff| 61 debian/rules|8 man/intel.man | 13 src/Makefile.am | 63 src/intel_device.c | 325 + src/intel_display.c |2 src/intel_driver.c |7 src/intel_driver.h |8 src/intel_list.h|2 src/intel_module.c | 59 src/intel_options.c |2 src/intel_options.h |2 src/sna/Makefile.am |2 src/sna/blt.c | 604 ++- src/sna/brw/brw_eu.h|2 src/sna/brw/brw_eu_debug.c | 95 src/sna/compiler.h |4 src/sna/gen2_render.c | 40 src/sna/gen3_render.c | 38 src/sna/gen4_render.c | 82 src/sna/gen5_render.c | 89 src/sna/gen6_render.c | 47 src/sna/gen7_render.c | 95 src/sna/kgem.c | 476 +- src/sna/kgem.h | 107 src/sna/sna.h | 16 src/sna/sna_accel.c | 1060 - src/sna/sna_blt.c | 247 - src/sna/sna_composite.c |8 src/sna/sna_damage.c| 54 src/sna/sna_display.c | 982 +++-- src/sna/sna_display_fake.c | 59 src/sna/sna_dri.c | 174 src/sna/sna_driver.c| 160 src/sna/sna_glyphs.c|3 src/sna/sna_gradient.c | 13 src/sna/sna_io.c| 322 + src/sna/sna_render.c| 84 src/sna/sna_render.h|6 src/sna/sna_tiling.c| 116 src/sna/sna_trapezoids.c|7 src/sna/sna_video.c | 44 src/sna/sna_video.h |3 src/sna/sna_video_overlay.c | 10 src/sna/sna_video_sprite.c |5 src/sna/sna_video_textured.c| 20 test/Makefile.am|2 54 files changed, 5911 insertions(+), 1817 deletions(-) New commits: commit b8b686d1502fdad83896f86cc2affa46e56e6c5e Author: Maarten Lankhorst Date: Wed Jul 17 12:08:28 2013 +0200 bump changelogs, new upstream release diff --git a/ChangeLog b/ChangeLog index 9c05cdc..c82650d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,602 @@ +commit e83e7e60f41cb29132d5eef60af16b65b1b3cd4e +Author: Chris Wilson +Date: Sun Jul 14 09:31:39 2013 +0100 + +2.21.12 release + +commit 0230ef72cbb2d3bcf7157548ddd52a71c0c771c5 +Author: Chris Wilson +Date: Fri Jul 12 23:57:42 2013 +0100 + +sna: Skip copying to the intermediate target if we will completely overwrite it + +Occasionally when forced to use an intermediate destination surface, we +know that we will completely overwrite th
xserver-xorg-video-intel: Changes to 'upstream-experimental'
NEWS | 51 ++ configure.ac | 14 + man/intel.man | 13 + src/intel_device.c | 58 ++- src/intel_driver.c |5 src/intel_list.h |2 src/intel_module.c | 56 --- src/intel_options.c|2 src/intel_options.h|2 src/sna/compiler.h |4 src/sna/gen2_render.c | 26 ++- src/sna/gen3_render.c |9 - src/sna/gen4_render.c | 57 +-- src/sna/gen5_render.c | 26 ++- src/sna/gen6_render.c | 16 +- src/sna/gen7_render.c | 16 +- src/sna/kgem.c | 250 ++-- src/sna/kgem.h |9 + src/sna/sna.h |7 src/sna/sna_accel.c| 232 ++ src/sna/sna_blt.c | 73 + src/sna/sna_composite.c|6 src/sna/sna_damage.c | 46 ++ src/sna/sna_display.c | 343 ++--- src/sna/sna_display_fake.c | 59 --- src/sna/sna_dri.c |4 src/sna/sna_driver.c | 30 --- src/sna/sna_glyphs.c |3 src/sna/sna_io.c | 238 +-- src/sna/sna_render.c |6 src/sna/sna_render.h |3 src/sna/sna_tiling.c | 45 +++-- 32 files changed, 1046 insertions(+), 665 deletions(-) New commits: commit e83e7e60f41cb29132d5eef60af16b65b1b3cd4e Author: Chris Wilson Date: Sun Jul 14 09:31:39 2013 +0100 2.21.12 release diff --git a/NEWS b/NEWS index 576ef86..8202e78 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,54 @@ +Release 2.21.12 (2013-07-14) + +In this release, we clear up the teething troubles from preserving the KMS +configuration, notably external connections on Haswell and plugging in new +outputs after startup were broken. Besides these regression fixes, there +are a couple of fixes for some long standing issues, such as incorrect +rendering on gen2, an infinite loop with very, very large pixmaps and a +slight improvement to the tempermental gen4. + + * Allow untiled scanouts again (required for large extended desktops on + gen2 and gen3). + [Regression from 2.21.11] + + * Use the correct count of the number of dirty damage boxes for the quick + check on whether the existing damage contains the requested area. + The danger is that we may get a false result and skip migration and so + cause pixmap corruption (in the unlikely event that the application + frequently causes fallbacks). + [Regression from 2.21.11] + https://bugs.freedesktop.org/show_bug.cgi?id=66430 + + * Fix initial connection probing for multi-function encoders, such as the + external connections on Haswell. + [Regression from 2.21.11, initial connection probing] + https://bugs.freedesktop.org/show_bug.cgi?id=66488 + + * Fix gen2 rendercopy into a8 surfaces, for example, glyph uploads into + the glyph cache. + + * Fix detection of user overrides for initial connection configuration. + The code used the xorg-server-1.15 values, having missed the + introduction of ZoomModes into that release. + [Regression from 2.21.11, initial connection probing] + + * Always initialise the gamma ramp, even on unconnected CRTCs. + https://bugs.freedesktop.org/show_bug.cgi?id=66563 + [Regression from 2.21.11, initial connection probing] + + * Some more tuning of the gen4 vertex corruption workaround. The root + cause behind the GPU using incorrect texture coordinates is still + not solved, but by reducing the maximum number or rectangles in + flight through the GPU we reduce the likelihood of corruption. + + * Fix compilation with gcc-4.5 + [Regression from 2.21.11] + + * Avoid integer overflow when performing tiled uploads and operations + on very large (>28k pixels wide or tall pixmaps) + https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1200766 + + Release 2.21.11 (2013-06-30) An eventful week. What started with a regression with some builds of diff --git a/configure.ac b/configure.ac index 46a5a6f..2c41f20 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-intel], -[2.21.11], +[2.21.12], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-intel]) AC_CONFIG_SRCDIR([Makefile.am]) commit 0230ef72cbb2d3bcf7157548ddd52a71c0c771c5 Author: Chris Wilson Date: Fri Jul 12 23:57:42 2013 +0100 sna: Skip copying to the intermediate target if we will completely overwrite it Occasionally when forced to use an intermediate destination surface, we know that we will completely overwrite the contents of the surface and so we can forgo the initial copy from the target. Signed-off-by: Chris Wilson diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c index ba576
