From 00e7be6246ac42618681493f1d9f9a41f1184c7f Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Oct 05 2009 04:31:11 +0000 Subject: * Mon Oct 05 2009 Dave Airlie 1.7.0-1 - rebase to 1.7.0 upstream release - were 99% this already --- diff --git a/.cvsignore b/.cvsignore index 572311c..b72fec4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-1.6.99.903.tar.bz2 +xorg-server-1.7.0.tar.bz2 diff --git a/sources b/sources index efc397f..b9e7102 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a2f20ebbeeae5c13f7a78df314b1164 xorg-server-1.6.99.903.tar.bz2 +e0b70d3d542959f677210172d2b0f237 xorg-server-1.7.0.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 54aa0f7..8d4a5f0 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -18,8 +18,8 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.6.99.903 -Release: 2%{dist} +Version: 1.7.0 +Release: 1%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -73,10 +73,6 @@ Patch6030: xserver-1.6.99-right-of.patch Patch6033: xserver-1.6.99-default-modes.patch Patch6044: xserver-1.6.99-hush-prerelease-warning.patch -# upstream already -Patch7000: xserver-1.6.99-rotate-wrapping-fix.patch -Patch7001: xserver-1.6.99-exa-infinite-loop.patch - %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri %define sdkdir %{_includedir}/xorg @@ -504,6 +500,9 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Mon Oct 05 2009 Dave Airlie 1.7.0-1 +- rebase to 1.7.0 upstream release - were 99% this already + * Thu Oct 01 2009 Dave Airlie 1.6.99.903-2 - backport EXA and rotate crash fixes diff --git a/xserver-1.6.99-exa-infinite-loop.patch b/xserver-1.6.99-exa-infinite-loop.patch deleted file mode 100644 index c56362c..0000000 --- a/xserver-1.6.99-exa-infinite-loop.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fc599ab01ccaaff3c0bfc5a4d623efe725f175db Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= -Date: Thu, 1 Oct 2009 15:15:19 +1000 -Subject: [PATCH] exa: avoid infinite loops if UTS sw fallbacks. - -The upload in finish access can cause an infinite loop if -UTS returns FALSE in here. - -Signed-off-by: Dave Airlie ---- - exa/exa_migration_classic.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/exa/exa_migration_classic.c b/exa/exa_migration_classic.c -index 4819af8..6d7b9f5 100644 ---- a/exa/exa_migration_classic.c -+++ b/exa/exa_migration_classic.c -@@ -242,11 +242,6 @@ exaCopyDirty(ExaMigrationPtr migrate, RegionPtr pValidDst, RegionPtr pValidSrc, - pBox++; - } - -- if (access_prepared) -- exaFinishAccess(&pPixmap->drawable, fallback_index); -- else if (need_sync && sync) -- sync (pPixmap->drawable.pScreen); -- - pExaPixmap->offscreen = save_offscreen; - pPixmap->devKind = save_pitch; - -@@ -261,6 +256,11 @@ exaCopyDirty(ExaMigrationPtr migrate, RegionPtr pValidDst, RegionPtr pValidSrc, - REGION_UNION(pScreen, pValidDst, pValidDst, &CopyReg); - - REGION_UNINIT(pScreen, &CopyReg); -+ -+ if (access_prepared) -+ exaFinishAccess(&pPixmap->drawable, fallback_index); -+ else if (need_sync && sync) -+ sync (pPixmap->drawable.pScreen); - } - - /** --- -1.6.5.rc2 - diff --git a/xserver-1.6.99-rotate-wrapping-fix.patch b/xserver-1.6.99-rotate-wrapping-fix.patch deleted file mode 100644 index 732c905..0000000 --- a/xserver-1.6.99-rotate-wrapping-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f1893a5a434e483ab40001e5a765902f7ce5ed4e Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Thu, 1 Oct 2009 15:24:04 +1000 -Subject: [PATCH] rotate: drop unwrapping inside block handler. - -Keith has shown half the block handlers wrappers are wrong, also -dynamic wrapping/unwrapping from what I can see will happen after -the drivers, so its really accidental ABI, that we can't change -now without modifing drivers. So be safe for 1.7. - -Signed-off-by: Dave Airlie ---- - hw/xfree86/modes/xf86Rotate.c | 10 +++------- - 1 files changed, 3 insertions(+), 7 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c -index 9e65c99..5de6b0c 100644 ---- a/hw/xfree86/modes/xf86Rotate.c -+++ b/hw/xfree86/modes/xf86Rotate.c -@@ -268,13 +268,9 @@ xf86RotateBlockHandler(int screenNum, pointer blockData, - rotation_active = xf86RotateRedisplay(pScreen); - pScreen->BlockHandler = xf86_config->BlockHandler; - (*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask); -- if (rotation_active) { -- /* Re-wrap if rotation is still happening */ -- xf86_config->BlockHandler = pScreen->BlockHandler; -- pScreen->BlockHandler = xf86RotateBlockHandler; -- } else { -- xf86_config->BlockHandler = NULL; -- } -+ /* cannot avoid re-wrapping until all wrapping is audited */ -+ xf86_config->BlockHandler = pScreen->BlockHandler; -+ pScreen->BlockHandler = xf86RotateBlockHandler; - } - - void --- -1.6.5.rc2 -