Bug#703291: [xserver-xorg-video-nouveau] Dual display problem: Using xrandr to setup dual displays causes X to hang

2013-03-19 Thread Sven Joachim
On 2013-03-18 22:44 +0100, Guy Heatley wrote:

> Sven - I can confirm that your downgrading suggestion fixes this problem.
>
> On 18/03/13 17:03, Sven Joachim wrote:
>> Kernel folks, this appears to be a regression resulting from the
>> DRM 3.4 backport.
>
>> Can you confirm that downgrading linux-image-3.2.0-4-amd64 to
>> 3.2.35-2 (available on snapshots.debian.org[1]) fixes the problem?
>
> Yes, this fixes it.

Could you please try a 3.8 kernel from experimental (requires
initramfs-tools from experimental as well)?  If the problem persists,
file a bug on https://bugs.freedesktop.org/.  Choose product xorg,
component Driver/nouveau, and let us know the bug number.

Cheers,
   Sven


-- 
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/874ng7ji0y@turtle.gmx.de



Processed: severity of 690081 is wishlist

2013-03-19 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> # stop fucking with my bugs kthxbye
> severity 690081 wishlist
Bug #690081 [libwayland0] libwayland0:i386 and libwayland0:amd64 are 
conflicting, blocking multiarch gtk2.0 installation
Severity set to 'wishlist' from 'grave'
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
690081: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690081
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.136371992519523.transcr...@bugs.debian.org



Bug#690081: Processed: your mail

2013-03-19 Thread Julien Cristau
On Tue, Mar 19, 2013 at 19:57:17 +0100, Erich Schubert wrote:

> Control: severity 690081 grave
> 
> > No, this bug is in no way grave.
> 
> Sure it is, by definition of "grave":
> 
> http://www.debian.org/Bugs/Developer#severities
> 
> >> grave
> >>makes the package in question unusable or mostly so [...]
> 
> The package is *unusable* (as in: *uninstallable*) on multiarch.
> 
Absolutely not.  Policy has no requirement that a library package be
multiarch-compatible.  libwayland0 is installable and working on every
arch where it exists, it's just not compatible with multiarch, has never
been, and making it so is a wishlist bug.

Cheers,
Julien


signature.asc
Description: Digital signature


Processed: Re: Processed: your mail

2013-03-19 Thread Debian Bug Tracking System
Processing control commands:

> severity 690081 grave
Bug #690081 [libwayland0] libwayland0:i386 and libwayland0:amd64 are 
conflicting, blocking multiarch gtk2.0 installation
Severity set to 'grave' from 'wishlist'

-- 
690081: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690081
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.b690081.136371944515833.transcr...@bugs.debian.org



Bug#690081: Processed: your mail

2013-03-19 Thread Erich Schubert
Control: severity 690081 grave

> No, this bug is in no way grave.

Sure it is, by definition of "grave":

http://www.debian.org/Bugs/Developer#severities

>> grave
>>makes the package in question unusable or mostly so [...]

The package is *unusable* (as in: *uninstallable*) on multiarch.

This actually is a *release-critical* bug (just not for wheezy, but wheezy+1!)

Sorry, but it *definitely* is not wishlist:

>> wishlist
>>for any feature request, and also for any bugs that are very difficult to 
>> fix due to major design considerations.

Feature request: no. it is an actual *bug* in the *packaging*, not a
feature request for wayland.
Difficult to fix: judging from the bug report, there exists a known fix - so no.

If you want, we could discuss about using:

>> critical
>>makes unrelated software on the system (or the whole system) break [...]

because it breaks GTK3 -> Cairo -> EGL installation in experimental.

Regards,
Erich


-- 
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/cagkbab92funyctpc+w+torxdq3oq7uj7vmxxl2oxatbwrgh...@mail.gmail.com



Bug#690081: Processed: your mail

2013-03-19 Thread Julien Cristau
Control: severity 690081 wishlist

On Tue, Mar 19, 2013 at 08:45:13 +, Debian Bug Tracking System wrote:

> Processing commands for cont...@bugs.debian.org:
> 
> > severity 690081 grave
> Bug #690081 [libwayland0] libwayland0:i386 and libwayland0:amd64 are 
> conflicting, blocking multiarch gtk2.0 installation
> Severity set to 'grave' from 'wishlist'

No, this bug is in no way grave.

Cheers,
Julien


signature.asc
Description: Digital signature


Processed: Re: Processed: your mail

2013-03-19 Thread Debian Bug Tracking System
Processing control commands:

> severity 690081 wishlist
Bug #690081 [libwayland0] libwayland0:i386 and libwayland0:amd64 are 
conflicting, blocking multiarch gtk2.0 installation
Severity set to 'wishlist' from 'grave'

-- 
690081: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690081
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.b690081.136371715129919.transcr...@bugs.debian.org



xserver-xorg-video-intel: Changes to 'ubuntu'

2013-03-19 Thread Timo Aaltonen
 ChangeLog|  946 
 NEWS |   38 
 configure.ac |2 
 debian/changelog |   15 
 src/intel_driver.c   |4 
 src/intel_driver.h   |   18 
 src/intel_module.c   |4 
 src/sna/Makefile.am  |2 
 src/sna/compiler.h   |   13 
 src/sna/gen2_render.c|  326 +
 src/sna/gen3_render.c| 2538 ++-
 src/sna/gen4_render.c|   55 
 src/sna/gen4_vertex.c| 1639 +++
 src/sna/gen4_vertex.h|4 
 src/sna/gen5_render.c|   52 
 src/sna/gen6_render.c|   52 
 src/sna/gen7_render.c|   58 
 src/sna/kgem.c   |   85 +
 src/sna/kgem.h   |3 
 src/sna/sna.h|   26 
 src/sna/sna_accel.c  |  208 ++-
 src/sna/sna_blt.c|8 
 src/sna/sna_composite.c  |9 
 src/sna/sna_cpu.c|  114 +
 src/sna/sna_display.c|  135 +-
 src/sna/sna_display_fake.c   |  320 +
 src/sna/sna_dri.c|  199 ---
 src/sna/sna_driver.c |   75 +
 src/sna/sna_glyphs.c |   17 
 src/sna/sna_gradient.c   |   10 
 src/sna/sna_io.c |4 
 src/sna/sna_render.c |   46 
 src/sna/sna_render.h |3 
 src/sna/sna_tiling.c |   17 
 src/sna/sna_trapezoids.c |   14 
 src/sna/sna_video.c  |8 
 src/sna/sna_video_textured.c |5 
 test/.gitignore  |2 
 38 files changed, 5576 insertions(+), 1498 deletions(-)

New commits:
commit 3d9f78a118ae9d931448d56d5bd7eebac37ec96b
Author: Timo Aaltonen 
Date:   Mon Mar 11 16:37:38 2013 +0200

release to raring

diff --git a/debian/changelog b/debian/changelog
index b61440e..415777b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.21.4-0ubuntu1) raring; urgency=low
+
+  * Merge from unreleased debian git
+- new upstream release (LP: #1124576, #1135403)
+
+ -- Timo Aaltonen   Mon, 11 Mar 2013 16:17:16 +0200
+
 xserver-xorg-video-intel (2:2.21.4-1) UNRELEASED; urgency=low
 
   * New upstream release.

commit d8a4f312e98c092962efac1fd31507ad416c5aa7
Author: Timo Aaltonen 
Date:   Mon Mar 11 16:14:47 2013 +0200

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index 27b8f4b..9430f14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,949 @@
+commit 4fb7be0a0d4bf027ed254399b6b538e979f525f2
+Author: Chris Wilson 
+Date:   Sun Mar 10 14:34:39 2013 +
+
+2.21.4 release
+
+commit 25a63b32c7b549ffb3c7f14de4bf2731d044eb39
+Author: Chris Wilson 
+Date:   Mon Mar 11 10:42:08 2013 +
+
+sna: Tighten checking for coherent maps
+
+Remember all the special cases where we can use a CPU mmap as a
+temporary substitute for a GTT mapping.
+
+Signed-off-by: Chris Wilson 
+
+commit 210d474a96d3adf7338b49ee2c234893b54bbb2c
+Author: Chris Wilson 
+Date:   Sun Mar 10 16:40:35 2013 +
+
+sna: Tweak CPU mappings to be only used if a read is required
+
+Signed-off-by: Chris Wilson 
+
+commit 35f50a98fde7a4ebe6871bd23475948a2a530633
+Author: Chris Wilson 
+Date:   Sun Mar 10 15:51:45 2013 +
+
+sna/dri: Flatten _sna_dri_destroy_buffer()
+
+One level of indentation can be trivially removed with an earlier return.
+
+Signed-off-by: Chris Wilson 
+
+commit b81ee116d36845e55f71be2db391f93c1b681d5d
+Author: Chris Wilson 
+Date:   Sun Mar 10 14:15:46 2013 +
+
+sna/dri: Add a couple more basic assertions
+
+To catch bad reference counting and loss of flush.
+
+Signed-off-by: Chris Wilson 
+
+commit 93ecd5606eaf2e1db2b844f39bb04d77fa53cf8d
+Author: Chris Wilson 
+Date:   Fri Mar 8 23:38:12 2013 +
+
+sna: Only shrink the maximum GPU size to fit into cache
+
+That is be very careful that we do not enlarge it past the aperture size
+on early gen.
+
+Signed-off-by: Chris Wilson 
+
+commit 78c756120db2e5e174925a92c0a0bba3ff70860c
+Author: Chris Wilson 
+Date:   Fri Mar 8 16:39:21 2013 +
+
+sna/gen4: Initialise a pair of unimportant variables
+
+Should never actually affect any results.
+
+Signed-off-by: Chris Wilson 
+
+commit dcd52d0c186e8b17569335338232298fbbea2b2d
+Author: Chris Wilson 
+Date:   Thu Mar 7 23:03:52 2013 +
+
+sna: Fallback if we cannot fit the tiling copy into the aperture
+
+If we cannot fit the source/destination and a tile into the aperture,
+then we cannot perform the copy and must do it using the CPU.
+
+Signed-off-by: Chris Wilson 
+
+commit 50d0ea02b3908156534fc00def55cfca30bbfecc
+Author: Chris Wilson 
+Date:   Thu Mar 7 22:58:21 2013 +
+
+sna: Trim tile sizes to fit aperture constraints
+
+This is especially important with gen2 where we have no unmappable GTT
+to utilise.
+
+Signed-off-by: Chris Wilson 
+
+commit cd1c14b172b0794f744b304f59b4f

xserver-xorg-video-intel: Changes to 'upstream-experimental'

2013-03-19 Thread Timo Aaltonen
 NEWS |   38 
 configure.ac |2 
 src/intel_driver.c   |4 
 src/intel_driver.h   |   18 
 src/intel_module.c   |4 
 src/sna/Makefile.am  |2 
 src/sna/compiler.h   |   13 
 src/sna/gen2_render.c|  326 +
 src/sna/gen3_render.c| 2538 ++-
 src/sna/gen4_render.c|   55 
 src/sna/gen4_vertex.c| 1639 +++
 src/sna/gen4_vertex.h|4 
 src/sna/gen5_render.c|   52 
 src/sna/gen6_render.c|   52 
 src/sna/gen7_render.c|   58 
 src/sna/kgem.c   |   85 +
 src/sna/kgem.h   |3 
 src/sna/sna.h|   26 
 src/sna/sna_accel.c  |  208 ++-
 src/sna/sna_blt.c|8 
 src/sna/sna_composite.c  |9 
 src/sna/sna_cpu.c|  114 +
 src/sna/sna_display.c|  135 +-
 src/sna/sna_display_fake.c   |  320 +
 src/sna/sna_dri.c|  199 ---
 src/sna/sna_driver.c |   75 +
 src/sna/sna_glyphs.c |   17 
 src/sna/sna_gradient.c   |   10 
 src/sna/sna_io.c |4 
 src/sna/sna_render.c |   46 
 src/sna/sna_render.h |3 
 src/sna/sna_tiling.c |   17 
 src/sna/sna_trapezoids.c |   14 
 src/sna/sna_video.c  |8 
 src/sna/sna_video_textured.c |5 
 test/.gitignore  |2 
 36 files changed, 4619 insertions(+), 1494 deletions(-)

New commits:
commit 4fb7be0a0d4bf027ed254399b6b538e979f525f2
Author: Chris Wilson 
Date:   Sun Mar 10 14:34:39 2013 +

2.21.4 release

diff --git a/NEWS b/NEWS
index 4c088bd..cb82e52 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,41 @@
+Release 2.21.4 (2013-03-11)
+===
+More bugs, more fixes, more releases. A minor new feature being introduced
+is the runtime detection of CPU instructions sets along with specialised
+paths to take advantage of the available CPU.
+
+ * Honour LinearFramebuffer for clumsy PowerXpress integration
+
+ * Disable read-read optimisations of mappings whilst the root
+   cause of a corruption issue remains elusive.
+   https://bugs.freedesktop.org/show_bug.cgi?id=61628
+
+ * Disable 8-bpp framebuffers in UXA as the regressions therein
+   remain unfixed.
+
+ * Restart vertex checks after lock contention
+   
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1124576
+
+ * Handle Screen Pixmap recreation whilst exported via PRIME.
+
+ * Correct application of scale factors to video source offsets.
+   https://bugs.freedesktop.org/show_bug.cgi?id=61610
+
+ * Chain up CloseScreen so that resources are actually freed across regen
+   https://bugs.freedesktop.org/show_bug.cgi?id=56608
+
+ * Fix Haswell CRW PCI-IDs
+
+ * Handle batch submission failure during DRI copies
+   https://bugs.freedesktop.org/show_bug.cgi?id=61708
+
+ * Probe for kernel support of requested Screen depth
+   
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1135403
+
+ * Correct GPU limits for early gen2 and gen3 architectures and prevent
+   an infinite recursion for particular image sizes.
+
+
 Release 2.21.3 (2013-02-20)
 ===
 A few minor bugfixes, another point release.
diff --git a/configure.ac b/configure.ac
index 97daee6..8fea817 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-[2.21.3],
+[2.21.4],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 25a63b32c7b549ffb3c7f14de4bf2731d044eb39
Author: Chris Wilson 
Date:   Mon Mar 11 10:42:08 2013 +

sna: Tighten checking for coherent maps

Remember all the special cases where we can use a CPU mmap as a
temporary substitute for a GTT mapping.

Signed-off-by: Chris Wilson 

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index e9f29d0..35c2a90 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1361,6 +1361,20 @@ void sna_pixmap_destroy(PixmapPtr pixmap)
sna_destroy_pixmap(pixmap);
 }
 
+static inline bool has_coherent_map(struct sna *sna,
+   struct kgem_bo *bo)
+{
+   assert(bo->map);
+
+   if (!IS_CPU_MAP(bo->map))
+   return true;
+
+   if (bo->tiling != I915_TILING_NONE)
+   return false;
+
+   return bo->domain == DOMAIN_CPU || sna->kgem.has_llc;
+}
+
 static inline bool pixmap_inplace(struct sna *sna,
  PixmapPtr pixmap,
  struct sna_pixmap *priv,
@@ -1373,7 +1387,7 @@ static inline bool pixmap_inplace(struct sna *sna,
return false;
 
if (priv->mapped)
-   return !IS_CPU_MAP(priv->gpu_bo->map) || sna->kgem.has_llc;
+   return has_coherent_map(sna, priv->gpu

xserver-xorg-video-intel: Changes to 'debian-experimental'

2013-03-19 Thread Timo Aaltonen
 ChangeLog|  946 
 NEWS |   38 
 configure.ac |2 
 debian/changelog |2 
 src/intel_driver.c   |4 
 src/intel_driver.h   |   18 
 src/intel_module.c   |4 
 src/sna/Makefile.am  |2 
 src/sna/compiler.h   |   13 
 src/sna/gen2_render.c|  326 +
 src/sna/gen3_render.c| 2538 ++-
 src/sna/gen4_render.c|   55 
 src/sna/gen4_vertex.c| 1639 +++
 src/sna/gen4_vertex.h|4 
 src/sna/gen5_render.c|   52 
 src/sna/gen6_render.c|   52 
 src/sna/gen7_render.c|   58 
 src/sna/kgem.c   |   85 +
 src/sna/kgem.h   |3 
 src/sna/sna.h|   26 
 src/sna/sna_accel.c  |  208 ++-
 src/sna/sna_blt.c|8 
 src/sna/sna_composite.c  |9 
 src/sna/sna_cpu.c|  114 +
 src/sna/sna_display.c|  135 +-
 src/sna/sna_display_fake.c   |  320 +
 src/sna/sna_dri.c|  199 ---
 src/sna/sna_driver.c |   75 +
 src/sna/sna_glyphs.c |   17 
 src/sna/sna_gradient.c   |   10 
 src/sna/sna_io.c |4 
 src/sna/sna_render.c |   46 
 src/sna/sna_render.h |3 
 src/sna/sna_tiling.c |   17 
 src/sna/sna_trapezoids.c |   14 
 src/sna/sna_video.c  |8 
 src/sna/sna_video_textured.c |5 
 test/.gitignore  |2 
 38 files changed, 5566 insertions(+), 1495 deletions(-)

New commits:
commit d8a4f312e98c092962efac1fd31507ad416c5aa7
Author: Timo Aaltonen 
Date:   Mon Mar 11 16:14:47 2013 +0200

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index 27b8f4b..9430f14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,949 @@
+commit 4fb7be0a0d4bf027ed254399b6b538e979f525f2
+Author: Chris Wilson 
+Date:   Sun Mar 10 14:34:39 2013 +
+
+2.21.4 release
+
+commit 25a63b32c7b549ffb3c7f14de4bf2731d044eb39
+Author: Chris Wilson 
+Date:   Mon Mar 11 10:42:08 2013 +
+
+sna: Tighten checking for coherent maps
+
+Remember all the special cases where we can use a CPU mmap as a
+temporary substitute for a GTT mapping.
+
+Signed-off-by: Chris Wilson 
+
+commit 210d474a96d3adf7338b49ee2c234893b54bbb2c
+Author: Chris Wilson 
+Date:   Sun Mar 10 16:40:35 2013 +
+
+sna: Tweak CPU mappings to be only used if a read is required
+
+Signed-off-by: Chris Wilson 
+
+commit 35f50a98fde7a4ebe6871bd23475948a2a530633
+Author: Chris Wilson 
+Date:   Sun Mar 10 15:51:45 2013 +
+
+sna/dri: Flatten _sna_dri_destroy_buffer()
+
+One level of indentation can be trivially removed with an earlier return.
+
+Signed-off-by: Chris Wilson 
+
+commit b81ee116d36845e55f71be2db391f93c1b681d5d
+Author: Chris Wilson 
+Date:   Sun Mar 10 14:15:46 2013 +
+
+sna/dri: Add a couple more basic assertions
+
+To catch bad reference counting and loss of flush.
+
+Signed-off-by: Chris Wilson 
+
+commit 93ecd5606eaf2e1db2b844f39bb04d77fa53cf8d
+Author: Chris Wilson 
+Date:   Fri Mar 8 23:38:12 2013 +
+
+sna: Only shrink the maximum GPU size to fit into cache
+
+That is be very careful that we do not enlarge it past the aperture size
+on early gen.
+
+Signed-off-by: Chris Wilson 
+
+commit 78c756120db2e5e174925a92c0a0bba3ff70860c
+Author: Chris Wilson 
+Date:   Fri Mar 8 16:39:21 2013 +
+
+sna/gen4: Initialise a pair of unimportant variables
+
+Should never actually affect any results.
+
+Signed-off-by: Chris Wilson 
+
+commit dcd52d0c186e8b17569335338232298fbbea2b2d
+Author: Chris Wilson 
+Date:   Thu Mar 7 23:03:52 2013 +
+
+sna: Fallback if we cannot fit the tiling copy into the aperture
+
+If we cannot fit the source/destination and a tile into the aperture,
+then we cannot perform the copy and must do it using the CPU.
+
+Signed-off-by: Chris Wilson 
+
+commit 50d0ea02b3908156534fc00def55cfca30bbfecc
+Author: Chris Wilson 
+Date:   Thu Mar 7 22:58:21 2013 +
+
+sna: Trim tile sizes to fit aperture constraints
+
+This is especially important with gen2 where we have no unmappable GTT
+to utilise.
+
+Signed-off-by: Chris Wilson 
+
+commit cd1c14b172b0794f744b304f59b4fc78f0d6f8d6
+Author: Chris Wilson 
+Date:   Thu Mar 7 10:16:19 2013 +
+
+sna: Remove the unused output and crtc lists
+
+Signed-off-by: Chris Wilson 
+
+commit 1b8fc8715598e7bf756ccfa99a6da59bab48c2a0
+Author: Chris Wilson 
+Date:   Thu Mar 7 10:12:14 2013 +
+
+sna: Disambiguate sna_crtc_resize()
+
+sna_crtc_resize() operates upon the whole configuration rather than a
+single crtc like the other sna_crtc_* so rename it to make it distinct.
+
+Signed-off-by: Chris Wilson 
+
+commit 5f1c2b3b8bb062a4574e5114b09a33b7e4f0c811
+Author: Chris

xorg-server: Changes to 'ubuntu'

2013-03-19 Thread Maarten Lankhorst
 debian/changelog |7 
 debian/control   |1 
 debian/patches/drm_device_keep_trying.patch  |8 
 debian/patches/os-use-libunwind-to-generate-backtraces.patch |  206 +++
 debian/patches/series|3 
 5 files changed, 218 insertions(+), 7 deletions(-)

New commits:
commit c47ff27c36f39b832b061b311a3a564d4e1581d3
Author: Maarten Lankhorst 
Date:   Tue Mar 19 07:52:53 2013 +0100

remove dead code from drm_device_keep_trying.patch

diff --git a/debian/patches/drm_device_keep_trying.patch 
b/debian/patches/drm_device_keep_trying.patch
index b36a226..14dafa9 100644
--- a/debian/patches/drm_device_keep_trying.patch
+++ b/debian/patches/drm_device_keep_trying.patch
@@ -26,7 +26,7 @@ Signed-off-by: Bryce Harrington 
  
  /* Linux platform device support */
  #include "xf86_OSproc.h"
-@@ -17,23 +18,60 @@
+@@ -17,23 +18,54 @@
  
  #include "hotplug.h"
  
@@ -55,11 +55,6 @@ Signed-off-by: Bryce Harrington 
  char *buf;
  int fd;
 +int err = 0;
-+int drm_wait_total = 2; /* Max seconds we'll wait for drm */
-+int drm_wait_usleep = 50;   /* How frequently we'll re-check */
-+int drm_wait_max_msgs = 10; /* Max errors we'll print to logs */
-+int drm_wait_counter = drm_wait_total * 100 / drm_wait_usleep;
-+int drm_wait_msg_time = drm_wait_counter / drm_wait_max_msgs;
  
  fd = open(path, O_RDWR, O_CLOEXEC);
  if (fd == -1)
@@ -88,7 +83,6 @@ Signed-off-by: Bryce Harrington 
 +} else
 +ErrorF("drmSetInterfaceVersion failed with %i(%s)\n", err, 
strerror(-err));
 +
-+err:
 +close(fd);
  return FALSE;
  }

commit 77260f62407a905e166f8029c561e4a4c4e9d942
Author: Maarten Lankhorst 
Date:   Thu Mar 14 16:12:06 2013 +0100

Add patch to improve backtraces in the Xorg log.

* Add patch to improve backtraces in the Xorg log.
  - os-use-libunwind-to-generate-backtraces.patch

diff --git a/debian/changelog b/debian/changelog
index 6a23fad..dd234da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.13.3-0ubuntu2) raring; urgency=low
+
+  * Add patch to improve backtraces in the Xorg log.
+- os-use-libunwind-to-generate-backtraces.patch
+
+ -- Maarten Lankhorst   Thu, 14 Mar 2013 
16:12:16 +0100
+
 xorg-server (2:1.13.3-0ubuntu1) raring; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 74c07fc..1e0d7e8 100644
--- a/debian/control
+++ b/debian/control
@@ -53,6 +53,7 @@ Build-Depends:
  libdbus-1-dev [kfreebsd-any],
  libhal-dev [kfreebsd-any],
  libudev-dev (>= 151-3) [linux-any],
+ libunwind8-dev,
  libselinux1-dev (>= 2.0.80) [linux-any],
  libaudit-dev [linux-any],
  x11proto-xf86dri-dev (>= 2.1.0),
diff --git a/debian/patches/os-use-libunwind-to-generate-backtraces.patch 
b/debian/patches/os-use-libunwind-to-generate-backtraces.patch
new file mode 100644
index 000..261bb7d
--- /dev/null
+++ b/debian/patches/os-use-libunwind-to-generate-backtraces.patch
@@ -0,0 +1,206 @@
+From cae16adcfea6d12c72c48b9091b7f562fcb6a925 Mon Sep 17 00:00:00 2001
+From: Marcin Slusarz 
+Date: Thu, 21 Feb 2013 09:02:44 +1000
+Subject: [PATCH] os: use libunwind to generate backtraces
+
+Libunwind generates backtraces much more reliably than glibc's "backtrace".
+
+Before:
+0: /opt/xserver/bin/X (0x40+0x18ce36) [0x58ce36]
+1: /opt/xserver/bin/X (xorg_backtrace+0x9) [0x58d119]
+2: /opt/xserver/bin/X (0x40+0x190d69) [0x590d69]
+3: /lib64/libpthread.so.0 (0x7fb904268000+0x10a90) [0x7fb904278a90]
+4: /lib64/libc.so.6 (ioctl+0x7) [0x7fb902fbf987]
+5: /usr/lib64/libdrm.so.2 (drmIoctl+0x28) [0x7fb90405ffa8]
+6: /usr/lib64/libdrm.so.2 (drmCommandWrite+0x1b) [0x7fb90406235b]
+7: /usr/lib64/libdrm_nouveau.so.2 (nouveau_bo_wait+0x89) [0x7fb902009719]
+8: /opt/xserver/lib/xorg/modules/drivers/nouveau_drv.so 
(0x7fb90220e000+0x76f3) [0x7fb9022156f3]
+9: /opt/xserver/lib/xorg/modules/libexa.so (0x7fb9019c7000+0xbae0) 
[0x7fb9019d2ae0]
+10: /opt/xserver/bin/X (0x40+0x17d2b3) [0x57d2b3]
+11: /opt/xserver/bin/X (0x40+0xc9930) [0x4c9930]
+12: /opt/xserver/bin/X (0x40+0x3a81a) [0x43a81a]
+13: /opt/xserver/bin/X (0x40+0x3d6a1) [0x43d6a1]
+14: /opt/xserver/bin/X (0x40+0x2c2ca) [0x42c2ca]
+15: /lib64/libc.so.6 (__libc_start_main+0xf5) [0x7fb902f019b5]
+16: /opt/xserver/bin/X (0x40+0x2c60d) [0x42c60d]
+17: ?? [0x0]
+
+After:
+0: /opt/xserver/bin/X (OsSigHandler+0x39) [0x590d69]
+1: /lib64/libpthread.so.0 (__restore_rt+0x0) [0x7fb904278a8f]
+2: /lib64/libc.so.6 (ioctl+0x7) [0x7fb902fbf987]
+3: /usr/lib64/libdrm.so.2 (drmIoctl+0x28) [0x7fb90405ffa8]
+4: /usr/lib64/libdrm.so.2 (drmCommandWrite+0x1b) [0x7fb90406235b]
+5: /usr/lib64/libdrm_nouveau.so.2 (nouveau_bo_wait+0x89) [0x7fb902009719]
+6: /opt/xserver/lib/xorg/modules/drivers/nouveau_drv.so 
(nouveau_exa_download_from_screen+0x1a3) [0x7fb9022156f3]

Bug#612836: xserver-xorg: keyboard input is duplicated on virtual (text) terminal in dual seat configuration

2013-03-19 Thread Sergey Spiridonov

I found workaround for this problem.

I do not get duplicated input anymore in Wheezy with gdm from Squeeze 
and with option


Option "GrabDevice" "True"

added to every evdev keyboard section.

Thanks

It must go into multiseat howto here:

http://wiki.debian.org/Multi_Seat_Debian_HOWTO
--
Best regards, Sergey Spiridonov


--
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/51482cd4.5040...@hurd.homeunix.org



Processed: your mail

2013-03-19 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

> severity 690081 grave
Bug #690081 [libwayland0] libwayland0:i386 and libwayland0:amd64 are 
conflicting, blocking multiarch gtk2.0 installation
Severity set to 'grave' from 'wishlist'
> tag 690081 +experimental
Bug #690081 [libwayland0] libwayland0:i386 and libwayland0:amd64 are 
conflicting, blocking multiarch gtk2.0 installation
Added tag(s) experimental.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
690081: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690081
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.136368265222884.transcr...@bugs.debian.org