xserver-xorg-video-ati: Changes to 'ubuntu'
debian/changelog | 3 ---
debian/patches/102_disable_pageflip_on_palm.diff | 13 -------------
debian/patches/series | 1 -
3 files changed, 17 deletions(-)
New commits:
commit 220ed67cd2f41b9047d8fa42f121c24bb77ee75a
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Mar 17 16:00:58 2011 +1100
Drop pageflip-disablement patch; this has been fixed in the kernel
diff --git a/debian/changelog b/debian/changelog
index 568f67a..3e58b65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,6 @@ xserver-xorg-video-ati (1:6.14.0-0ubuntu3) natty; urgency=low
* Rebuild against final Xserver 1.10 ABI
* debian/patches/101_fix_build_aginst_1.10rc3.diff:
- Cherry-pick build-fix against xserver 1.10rc3 and later.
- * debian/patches/102_disable_pageflip_on_palm.diff:
- - Disable page-flipping on Palm. This doesn't work, causing the desktop
- to freeze on compiz start up. (LP: #715330)
-- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 09 Mar 2011 18:45:43 +1100
diff --git a/debian/patches/102_disable_pageflip_on_palm.diff b/debian/patches/102_disable_pageflip_on_palm.diff
deleted file mode 100644
index 57bd68b..0000000
--- a/debian/patches/102_disable_pageflip_on_palm.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/radeon_kms.c b/src/radeon_kms.c
-index 125a132..e05f2aa 100644
---- a/src/radeon_kms.c
-+++ b/src/radeon_kms.c
-@@ -660,7 +660,7 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "KMS Color Tiling: %sabled\n", info->allowColorTiling ? "en" : "dis");
-
-- if (info->dri->pKernelDRMVersion->version_minor >= 8) {
-+ if (info->dri->pKernelDRMVersion->version_minor >= 8 && info->ChipFamily != CHIP_FAMILY_PALM) {
- info->allowPageFlip = xf86ReturnOptValBool(info->Options,
- OPTION_PAGE_FLIP, TRUE);
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
diff --git a/debian/patches/series b/debian/patches/series
index 93325f8..139a73c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
100_radeon-6.9.0-bgnr-enable.patch
101_fix_build_aginst_1.10rc3.diff
-102_disable_pageflip_on_palm.diff
Reply to: