debian/changelog |4
debian/patches/dri2-install-client-callback-only-once.diff | 76 +
debian/patches/series |1
3 files changed, 80 insertions(+), 1 deletion(-)
New commits:
commit a64a3dab8de1919ddbabfa0a64a9a31c898a7fac
Author: Timo Aaltonen
Date: Mon Oct 7 00:25:17 2013 +0300
release to saucy
diff --git a/debian/changelog b/debian/changelog
index f62dff6..650e537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ati (1:7.2.0-0ubuntu10) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:7.2.0-0ubuntu10) saucy; urgency=low
* Drop libatomic-ops-dev from build-deps.
* dri2-install-client-callback-only-once.diff: Fix a crasher when
commit 6d392a0fd984213e8b8529b94d95cad89254b53d
Author: Timo Aaltonen
Date: Mon Oct 7 00:23:40 2013 +0300
dri2-install-client-callback-only-once.diff: Fix a crasher when closing a
video player. (LP: #1232557)
diff --git a/debian/changelog b/debian/changelog
index 66abfa8..f62dff6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xserver-xorg-video-ati (1:7.2.0-0ubuntu10) UNRELEASED; urgency=low
* Drop libatomic-ops-dev from build-deps.
+ * dri2-install-client-callback-only-once.diff: Fix a crasher when
+closing a video player. (LP: #1232557)
-- Timo Aaltonen Fri, 27 Sep 2013 10:08:56 +0300
diff --git a/debian/patches/dri2-install-client-callback-only-once.diff
b/debian/patches/dri2-install-client-callback-only-once.diff
new file mode 100644
index 000..b4330d2
--- /dev/null
+++ b/debian/patches/dri2-install-client-callback-only-once.diff
@@ -0,0 +1,76 @@
+commit c45e728107269c6f51599dad4f6a02ccfef703f1
+Author: Michel Dänzer
+Date: Wed Sep 18 10:57:52 2013 +0200
+
+DRI2: Install client callback only once
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=60182
+Acked-by: Alex Deucher
+
+diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
+index fa3719d..a211960 100644
+--- a/src/radeon_dri2.c
b/src/radeon_dri2.c
+@@ -520,6 +520,8 @@ typedef struct _DRI2ClientEvents {
+
+ #if HAS_DEVPRIVATEKEYREC
+
++static int DRI2InfoCnt;
++
+ static DevPrivateKeyRec DRI2ClientEventsPrivateKeyRec;
+ #define DRI2ClientEventsPrivateKey (&DRI2ClientEventsPrivateKeyRec)
+
+@@ -1543,7 +1545,6 @@ radeon_dri2_screen_init(ScreenPtr pScreen)
+ RADEONInfoPtr info = RADEONPTR(pScrn);
+ DRI2InfoRec dri2_info = { 0 };
+ #ifdef USE_DRI2_SCHEDULING
+-RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+ const char *driverNames[2];
+ Bool scheduling_works = TRUE;
+ #endif
+@@ -1607,7 +1608,7 @@ radeon_dri2_screen_init(ScreenPtr pScreen)
+ dri2_info.driverNames = driverNames;
+ driverNames[0] = driverNames[1] = dri2_info.driverName;
+
+- if (pRADEONEnt->dri2_info_cnt == 0) {
++ if (DRI2InfoCnt == 0) {
+ #if HAS_DIXREGISTERPRIVATEKEY
+ if (!dixRegisterPrivateKey(DRI2ClientEventsPrivateKey,
+ PRIVATE_CLIENT,
sizeof(DRI2ClientEventsRec))) {
+@@ -1627,7 +1628,7 @@ radeon_dri2_screen_init(ScreenPtr pScreen)
+ AddCallback(&ClientStateCallback, radeon_dri2_client_state_changed,
0);
+ }
+
+- pRADEONEnt->dri2_info_cnt++;
++ DRI2InfoCnt++;
+ }
+ #endif
+
+@@ -1646,12 +1647,12 @@ void radeon_dri2_close_screen(ScreenPtr pScreen)
+ {
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ RADEONInfoPtr info = RADEONPTR(pScrn);
+-#ifdef USE_DRI2_SCHEDULING
+-RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+
+-if (--pRADEONEnt->dri2_info_cnt == 0)
++#ifdef USE_DRI2_SCHEDULING
++if (--DRI2InfoCnt == 0)
+ DeleteCallback(&ClientStateCallback, radeon_dri2_client_state_changed,
0);
+ #endif
++
+ DRI2CloseScreen(pScreen);
+ drmFree(info->dri2.device_name);
+ }
+diff --git a/src/radeon_probe.h b/src/radeon_probe.h
+index 67e70ef..de0135d 100644
+--- a/src/radeon_probe.h
b/src/radeon_probe.h
+@@ -135,7 +135,6 @@ typedef struct
+ int fd_ref;
+ unsigned long fd_wakeup_registered; /* server generation for which fd
has been registered for wakeup handling */
+ int fd_wakeup_ref;
+-int dri2_info_cnt;
+ } RADEONEntRec, *RADEONEntPtr;
+
+ extern const OptionInfoRec *RADEONOptionsWeak(void);
diff --git a/debian/patches/series b/debian/patches/series
index 51683fa..5b08976 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
xmir.patch
+dri2-install-client-callback-only-once.diff
--
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/e1vsvra-00019f...@vasks.debian.org
