diff -u xserver-xorg-video-ati-6.10.0/debian/changelog xserver-xorg-video-ati-6.10.0/debian/changelog --- xserver-xorg-video-ati-6.10.0/debian/changelog +++ xserver-xorg-video-ati-6.10.0/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-ati (1:6.10.0-1ubuntu2) jaunty; urgency=low + + * Fall back to software for repeat modes that the driver currently doesn't + support (LP: #217908) + + -- Thomas Jaeger Sat, 24 Jan 2009 13:13:25 -0500 + xserver-xorg-video-ati (1:6.10.0-1ubuntu1) jaunty; urgency=low * Merge with Debian. Remaining Ubuntu changes: diff -u xserver-xorg-video-ati-6.10.0/debian/patches/series xserver-xorg-video-ati-6.10.0/debian/patches/series --- xserver-xorg-video-ati-6.10.0/debian/patches/series +++ xserver-xorg-video-ati-6.10.0/debian/patches/series @@ -2,0 +3 @@ +105_Fall-back-to-software-for-unsupported-repeat-modes.patch only in patch2: unchanged: --- xserver-xorg-video-ati-6.10.0.orig/debian/patches/105_Fall-back-to-software-for-unsupported-repeat-modes.patch +++ xserver-xorg-video-ati-6.10.0/debian/patches/105_Fall-back-to-software-for-unsupported-repeat-modes.patch @@ -0,0 +1,52 @@ +From 7e54c4b8acafead8de5d0dd6fdc1b619f832dd6f Mon Sep 17 00:00:00 2001 +From: Thomas Jaeger +Date: Fri, 23 Jan 2009 20:03:27 -0500 +Subject: [PATCH] Fall back to software for unsupported repeat modes + +--- + src/radeon_exa_render.c | 15 +++++++++++++++ + 1 files changed, 15 insertions(+), 0 deletions(-) + +diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c +index e33afef..38a9ea7 100644 +--- a/src/radeon_exa_render.c ++++ b/src/radeon_exa_render.c +@@ -344,6 +344,11 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict, int unit) + RADEON_FALLBACK(("Unsupported filter 0x%x\n", pPict->filter)); + } + ++ if (pPict->repeat && pPict->repeatType != RepeatNormal) ++ { ++ RADEON_FALLBACK(("Unsupported repeat type %d\n", pPict->repeat)); ++ } ++ + return TRUE; + } + +@@ -666,6 +671,11 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict, int unit) + pPict->filter != PictFilterBilinear) + RADEON_FALLBACK(("Unsupported filter 0x%x\n", pPict->filter)); + ++ if (pPict->repeat && pPict->repeatType != RepeatNormal) ++ { ++ RADEON_FALLBACK(("Unsupported repeat type %d\n", pPict->repeat)); ++ } ++ + return TRUE; + } + +@@ -1002,6 +1012,11 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict, + RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n")); + } + ++ if (pPict->repeat && pPict->repeatType != RepeatNormal) ++ { ++ RADEON_FALLBACK(("Unsupported repeat type %d\n", pPict->repeat)); ++ } ++ + return TRUE; + } + +-- +1.6.0.6 +