diff -u xserver-xorg-video-openchrome-0.2.903+svn713/debian/changelog xserver-xorg-video-openchrome-0.2.903+svn713/debian/changelog --- xserver-xorg-video-openchrome-0.2.903+svn713/debian/changelog +++ xserver-xorg-video-openchrome-0.2.903+svn713/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-openchrome (1:0.2.903+svn713-1ubuntu1) jaunty; urgency=low + + * Fall back to software for unsupported repeat modes (LP: #217908) + + -- Thomas Jaeger Fri, 30 Jan 2009 11:49:56 -0500 + xserver-xorg-video-openchrome (1:0.2.903+svn713-1) experimental; urgency=low * New upstream snapshot diff -u xserver-xorg-video-openchrome-0.2.903+svn713/debian/patches/series xserver-xorg-video-openchrome-0.2.903+svn713/debian/patches/series --- xserver-xorg-video-openchrome-0.2.903+svn713/debian/patches/series +++ xserver-xorg-video-openchrome-0.2.903+svn713/debian/patches/series @@ -1,0 +2 @@ +02_fix_repeat_pad.patch only in patch2: unchanged: --- xserver-xorg-video-openchrome-0.2.903+svn713.orig/debian/patches/02_fix_repeat_pad.patch +++ xserver-xorg-video-openchrome-0.2.903+svn713/debian/patches/02_fix_repeat_pad.patch @@ -0,0 +1,68 @@ +From 4994297f06add93574e94972bd22544374a47134 Mon Sep 17 00:00:00 2001 +From: jnettlet +Date: Mon, 26 Jan 2009 12:08:45 +0000 +Subject: [PATCH] small bug fixes for XAA and EXA + +git-svn-id: http://svn.openchrome.org/svn/trunk@726 e8d65cb0-85f4-0310-8831-c60e2a5ce829 +--- + src/via_accel.c | 9 +++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/src/via_accel.c b/src/via_accel.c +index f895085..7d8119e 100644 +--- a/src/via_accel.c ++++ b/src/via_accel.c +@@ -60,6 +60,7 @@ enum VIA_2D_Regs { + DSTPOS, + LINE_K1K2, + LINE_XY, ++ LINE_ERROR, + DIMENSION, + PATADDR, + FGCOLOR, +@@ -69,7 +70,6 @@ enum VIA_2D_Regs { + CLIPTL, + CLIPBR, + OFFSET, +- LINE_ERROR, + KEYCONTROL, + SRCBASE, + DSTBASE, +@@ -90,6 +90,7 @@ static const unsigned via_2d_regs[] = { + [DSTPOS] = VIA_REG_DSTPOS, + [LINE_K1K2] = VIA_REG_LINE_K1K2, + [LINE_XY] = VIA_REG_LINE_XY, ++ [LINE_ERROR] = VIA_REG_LINE_ERROR, + [DIMENSION] = VIA_REG_DIMENSION, + [PATADDR] = VIA_REG_PATADDR, + [FGCOLOR] = VIA_REG_FGCOLOR, +@@ -118,6 +119,7 @@ static const unsigned via_2d_regs_m1[] = { + [DSTPOS] = VIA_REG_DSTPOS_M1, + [LINE_K1K2] = VIA_REG_LINE_K1K2_M1, + [LINE_XY] = VIA_REG_LINE_XY_M1, ++ [LINE_ERROR] = VIA_REG_LINE_ERROR_M1, + [DIMENSION] = VIA_REG_DIMENSION_M1, + [PATADDR] = VIA_REG_PATADDR_M1, + [FGCOLOR] = VIA_REG_FGCOLOR_M1, +@@ -1279,7 +1281,7 @@ viaInitXAA(ScreenPtr pScreen) + SCANLINE_PAD_DWORD | + BIT_ORDER_IN_BYTE_MSBFIRST | + LEFT_EDGE_CLIPPING | ROP_NEEDS_SOURCE | 0); +- //SYNC_AFTER_IMAGE_WRITE | 0); ++ // SYNC_AFTER_IMAGE_WRITE | 0); + + /* + * Most Unichromes are much faster using processor-to-framebuffer writes +@@ -2058,6 +2060,9 @@ viaExaCheckComposite(int op, PicturePtr pSrcPicture, + pMaskPicture->pDrawable->height < VIA_MIN_COMPOSITE) + return FALSE; + ++ if (pMaskPicture->repeat != RepeatNormal) ++ return FALSE; ++ + if (pMaskPicture && pMaskPicture->componentAlpha) { + #ifdef VIA_DEBUG_COMPOSITE + ErrorF("Component Alpha operation\n"); +-- +1.6.0.6 +