xserver-xorg-video-ati: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
src/radeon_video.c | 6 ++++--
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit aac10a1cdfac8db5c757bb2da1c60b0973d025ad
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Dec 11 12:14:33 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index d8c7ff2..a22f71b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-ati (1:6.14.3-2) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.14.3-2) unstable; urgency=low
* Fix xinerama by cherry-picking:
- 82069bae6f: “fixup xinerama since 9151f3b1c2” (Closes: #649495).
- -- Cyril Brulebois <kibi@debian.org> Sun, 11 Dec 2011 12:11:47 +0100
+ -- Cyril Brulebois <kibi@debian.org> Sun, 11 Dec 2011 12:14:23 +0100
xserver-xorg-video-ati (1:6.14.3-1) unstable; urgency=low
commit d87f563baef371badd8899fcfa9ae9ef1d719427
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Dec 11 12:14:17 2011 +0100
Fix xinerama by cherry-picking 82069bae6f (Closes: #649495).
diff --git a/debian/changelog b/debian/changelog
index 53dc805..d8c7ff2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-ati (1:6.14.3-2) UNRELEASED; urgency=low
+
+ * Fix xinerama by cherry-picking:
+ - 82069bae6f: “fixup xinerama since 9151f3b1c2” (Closes: #649495).
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 11 Dec 2011 12:11:47 +0100
+
xserver-xorg-video-ati (1:6.14.3-1) unstable; urgency=low
* New upstream release. Some highlights follow:
commit 82069bae6f4d390164f313eef63a1ce442b3904e
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Nov 28 18:38:30 2011 +0000
fixup xinerama since 9151f3b1c2ebcc34e63195888ba696f2183ba5e2
since the driver would call RRFirstOutput without checking if randr has
been enabled, and it would crash in privates code.
reported by vereteran on #radeon
Signed-off-by: Dave Airlie <airlied@redhat.com>
Acked-on-irc-by: Michel Dänzer <michel.daenzer@amd.com>
(cherry picked from commit 3853c3020d05175ae180b9a188dec7c425bdd0b8)
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 834f924..0e2c127 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -142,7 +142,7 @@ radeon_pick_best_crtc(ScrnInfoPtr pScrn,
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
int coverage, best_coverage, c;
BoxRec box, crtc_box, cover_box;
- RROutputPtr primary_output;
+ RROutputPtr primary_output = NULL;
xf86CrtcPtr best_crtc = NULL, primary_crtc = NULL;
box.x1 = x1;
@@ -152,7 +152,9 @@ radeon_pick_best_crtc(ScrnInfoPtr pScrn,
best_coverage = 0;
/* Prefer the CRTC of the primary output */
- primary_output = RRFirstOutput(pScrn->pScreen);
+ if (dixPrivateKeyRegistered(rrPrivKey)) {
+ primary_output = RRFirstOutput(pScrn->pScreen);
+ }
if (primary_output && primary_output->crtc)
primary_crtc = primary_output->crtc->devPrivate;
Reply to: