Merge lp:~matttbe/ubuntu/raring/xserver-xorg-video-intel/lp1104041 into lp:ubuntu/raring/xserver-xorg-video-intel

[Matthieu Baerts]

Hello Timo,

This new branch fixes this bug #1104041 .
It includes a patch made by Chris Wilson.
For more details:
 * https://bugs.freedesktop.org/show_bug.cgi?id=59806
 * http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=d60128c55e8f5f69476d42c20f2fd62ccc0f411e

I add you as reviewer because I see that you've uploaded all older versions on Raring but I can change if you want ;)

Regards,

Matt

[Timo Aaltonen (tjaalton)]

thanks for handling the bug upstream, I'll approve it but since we're using git on git.debian.org I'll just update the snapshot there directly

in the future you can just ping us on #ubuntu-x about available fixes :)

review: Approve

[Matthieu Baerts (matttbe)]

> in the future you can just ping us on #ubuntu-x about available fixes :)
Ok. I'll do that next time :)

Thank you for your support!

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-24 10:22:41 +0000
+++ debian/changelog	2013-01-24 20:02:22 +0000
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.20.19-0ubuntu3) raring; urgency=low
+
+  * debian/patches/upstream-git-clipExtents.patch:
+    - Compensate clipExtents for drawable offset (LP: #1104041).
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Thu, 24 Jan 2013 20:51:54 +0100
+
 xserver-xorg-video-intel (2:2.20.19-0ubuntu2) raring; urgency=low
 
   * upstream-snapshot-778dba90c.diff: Patch to update to current git

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-01-24 10:22:41 +0000
+++ debian/patches/series	2013-01-24 20:02:22 +0000
@@ -1,2 +1,3 @@
 0002-Update-manpage-for-new-accelmethod-option.patch
 upstream-snapshot-778dba90c.diff
+upstream-git-clipExtents.patch

=== added file 'debian/patches/upstream-git-clipExtents.patch'
--- debian/patches/upstream-git-clipExtents.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/upstream-git-clipExtents.patch	2013-01-24 20:02:22 +0000
@@ -0,0 +1,53 @@
+From d60128c55e8f5f69476d42c20f2fd62ccc0f411e Mon Sep 17 00:00:00 2001
+From: Chris Wilson <[e-mail]>
+Date: Thu, 24 Jan 2013 15:41:29 +0000
+Subject: sna/dri: Compensate clipExtents for drawable offset
+
+The clipExtents is in screen coordinates whereas we just want to confirm
+that the maximum pixel to be copied lies with the DRI2 buffer, which is
+relative to the drawable.
+
+Reported-by: Matthieu Baerts <[e-mail]>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59806
+Signed-off-by: Chris Wilson <[e-mail]>
+---
+diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
+index 9d249e3..15b87dd 100644
+--- a/src/sna/sna_dri.c
++++ b/src/sna/sna_dri.c
+@@ -842,20 +842,31 @@ can_blit(struct sna * sna,
+ 	 DRI2BufferPtr back)
+ {
+ 	RegionPtr clip;
++	int w, h;
+ 	uint32_t s;
+ 
+ 	if (draw->type == DRAWABLE_PIXMAP)
+ 		return true;
+ 
+ 	clip = &((WindowPtr)draw)->clipList;
++	w = clip->extents.x2 - draw->x;
++	h = clip->extents.y2 - draw->y;
++	if ((w|h) < 0)
++		return false;
+ 
+ 	s = get_private(front)->size;
+-	if ((s>>16) < clip->extents.y2 || (s&0xffff) < clip->extents.x2)
++	if ((s>>16) < h || (s&0xffff) < w) {
++		DBG(("%s: reject front size (%dx%d) < (%dx%d)\n", __func__,
++		       s&0xffff, s>>16, w, h));
+ 		return false;
++	}
+ 
+ 	s = get_private(back)->size;
+-	if ((s>>16) < clip->extents.y2 || (s&0xffff) < clip->extents.x2)
++	if ((s>>16) < h || (s&0xffff) < w) {
++		DBG(("%s:reject back size (%dx%d) < (%dx%d)\n", __func__,
++		     s&0xffff, s>>16, w, h));
+ 		return false;
++	}
+ 
+ 	return true;
+ }
+--
+cgit v0.9.0.2-2-gbebe