Hello community, here is the log from the commit of package xf86-video-r128 for openSUSE:Factory checked in at 2013-10-25 18:55:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-r128 (Old) and /work/SRC/openSUSE:Factory/.xf86-video-r128.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-r128" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-r128/xf86-video-r128.changes 2013-08-23 11:09:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-r128.new/xf86-video-r128.changes 2013-10-25 18:55:07.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Oct 25 13:58:17 UTC 2013 - [email protected] + +- Update to version 6.9.2 + * this version update fixes for EXA color errors on PowerPC, + plus updates to build with xserver 1.13 and 1.14 + +------------------------------------------------------------------- Old: ---- xf86-video-r128-6.9.1.tar.bz2 New: ---- xf86-video-r128-6.9.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-r128.spec ++++++ --- /var/tmp/diff_new_pack.CvGJc1/_old 2013-10-25 18:55:08.000000000 +0200 +++ /var/tmp/diff_new_pack.CvGJc1/_new 2013-10-25 18:55:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: xf86-video-r128 -Version: 6.9.1 +Version: 6.9.2 Release: 0 Summary: ATI Rage 128 video driver for the Xorg X server License: MIT ++++++ xf86-video-r128-6.9.1.tar.bz2 -> xf86-video-r128-6.9.2.tar.bz2 ++++++ ++++ 2894 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.9.1/ChangeLog new/xf86-video-r128-6.9.2/ChangeLog --- old/xf86-video-r128-6.9.1/ChangeLog 2012-09-28 03:26:01.000000000 +0200 +++ new/xf86-video-r128-6.9.2/ChangeLog 2013-10-02 21:01:33.000000000 +0200 @@ -1,3 +1,55 @@ +commit ccdfcf5c05ccade823c9734212dcb865d8958cbb +Author: Tormod Volden <[email protected]> +Date: Wed Oct 2 20:36:38 2013 +0200 + + r128: bump to version 6.9.2 + + Signed-off-by: Tormod Volden <[email protected]> + +commit 255cf857af35e4024486cbc2693872d020f09a29 +Author: Connor Behan <[email protected]> +Date: Mon Sep 30 23:24:54 2013 -0700 + + Specify NULL for the platform probe function + + Apparently this has been required by the ABI since server 1.13. + + Signed-off-by: Connor Behan <[email protected]> + +commit a98077959a65dfda1db900373969bd08479d3e43 +Author: Connor Behan <[email protected]> +Date: Mon Sep 30 21:12:20 2013 -0700 + + Minor spacing changes + + A log message needed a space added, two source files needed whitespace + removed. + + Signed-off-by: Connor Behan <[email protected]> + +commit aca6aa127f43deeed42c4d3bef8d1e6a735b4c50 +Author: Connor Behan <[email protected]> +Date: Fri Mar 8 01:02:22 2013 -0800 + + Swap pixmap bytes for a solid picture on big endian host + + Some PowerPC users were reporting color errors that only happened with + EXA+DRI. This implements a recent bugfix in the Radeon driver which will + solve at least one of these problems. + + Signed-off-by: Connor Behan <[email protected]> + +commit 24f28a78fdcd056357f137650ca7f0f01c257d97 +Author: Connor Behan <[email protected]> +Date: Wed Dec 19 10:41:14 2012 -0800 + + Remove call to obsolete miInitializeBackingStore() + + Definition was deleted from Xorg during 1.14 merge window, but has been + a no-op since 1.10 merge window. + + Signed-off-by: Connor Behan <[email protected]> + commit ef4467b4aac70b9a8a1ef1194eb02d7551be2602 Author: Dave Airlie <[email protected]> Date: Fri Sep 28 11:25:17 2012 +1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.9.1/configure.ac new/xf86-video-r128-6.9.2/configure.ac --- old/xf86-video-r128-6.9.1/configure.ac 2012-09-28 03:25:16.000000000 +0200 +++ new/xf86-video-r128-6.9.2/configure.ac 2013-10-02 20:35:51.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-r128], - [6.9.1], + [6.9.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-r128]) AC_CONFIG_SRCDIR([Makefile.am]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.9.1/src/r128.h new/xf86-video-r128-6.9.2/src/r128.h --- old/xf86-video-r128-6.9.1/src/r128.h 2012-09-28 03:17:47.000000000 +0200 +++ new/xf86-video-r128-6.9.2/src/r128.h 2013-10-02 20:30:05.000000000 +0200 @@ -602,6 +602,7 @@ extern void R128CCEReleaseIndirect(ScrnInfoPtr pScrn); extern void R128CCEWaitForIdle(ScrnInfoPtr pScrn); extern int R128CCEStop(ScrnInfoPtr pScrn); +extern void R128CopySwap(uint8_t *dst, uint8_t *src, unsigned int size, int swap); #ifdef USE_EXA extern Bool R128EXAInit(ScreenPtr pScreen); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.9.1/src/r128_accel.c new/xf86-video-r128-6.9.2/src/r128_accel.c --- old/xf86-video-r128-6.9.1/src/r128_accel.c 2012-07-27 03:50:46.000000000 +0200 +++ new/xf86-video-r128-6.9.2/src/r128_accel.c 2013-10-02 20:30:05.000000000 +0200 @@ -1869,6 +1869,43 @@ } #endif +void R128CopySwap(uint8_t *dst, uint8_t *src, unsigned int size, int swap) +{ + switch(swap) { + case APER_0_BIG_ENDIAN_32BPP_SWAP: + { + unsigned int *d = (unsigned int *)dst; + unsigned int *s = (unsigned int *)src; + unsigned int nwords = size >> 2; + + for (; nwords > 0; --nwords, ++d, ++s) +#ifdef __powerpc__ + asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d)); +#else + *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00) + | ((*s & 0xff00) << 8) | ((*s & 0xff) << 24); +#endif + return; + } + case APER_0_BIG_ENDIAN_16BPP_SWAP: + { + unsigned short *d = (unsigned short *)dst; + unsigned short *s = (unsigned short *)src; + unsigned int nwords = size >> 1; + + for (; nwords > 0; --nwords, ++d, ++s) +#ifdef __powerpc__ + asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d)); +#else + *d = (*s >> 8) | (*s << 8); +#endif + return; + } + } + if (src != dst) + memcpy(dst, src, size); +} + /* Initialize XAA for supported acceleration and also initialize the graphics hardware for acceleration. */ Bool R128AccelInit(ScreenPtr pScreen) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.9.1/src/r128_driver.c new/xf86-video-r128-6.9.2/src/r128_driver.c --- old/xf86-video-r128-6.9.1/src/r128_driver.c 2012-09-28 03:19:54.000000000 +0200 +++ new/xf86-video-r128-6.9.2/src/r128_driver.c 2013-10-02 20:30:05.000000000 +0200 @@ -2269,7 +2269,7 @@ #ifdef RENDER info->RenderAccel = xf86ReturnOptValBool(info->Options, OPTION_RENDERACCEL, TRUE); if (info->RenderAccel) - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Acceleration of RENDER operations will be enabled" + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Acceleration of RENDER operations will be enabled " "upon successful loading of DRI and EXA\n"); #endif #endif @@ -2701,7 +2701,6 @@ R128DGAInit(pScreen); /* Backing store setup */ - miInitializeBackingStore(pScreen); xf86SetBackingStore(pScreen); /* Set Silken Mouse */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.9.1/src/r128_exa_render.c new/xf86-video-r128-6.9.2/src/r128_exa_render.c --- old/xf86-video-r128-6.9.1/src/r128_exa_render.c 2012-07-27 03:48:59.000000000 +0200 +++ new/xf86-video-r128-6.9.2/src/r128_exa_render.c 2013-10-02 20:30:05.000000000 +0200 @@ -102,6 +102,17 @@ return NULL; } info->ExaDriver->WaitMarker(pScreen, 0); + +#if X_BYTE_ORDER == X_BIG_ENDIAN + if (pScrn->bitsPerPixel == 32) + R128CopySwap(info->ExaDriver->memoryBase + exaGetPixmapOffset(pPix), (uint8_t*)&solid, 4, + APER_0_BIG_ENDIAN_32BPP_SWAP); + else if (pScrn->bitsPerPixel == 16) + R128CopySwap(info->ExaDriver->memoryBase + exaGetPixmapOffset(pPix), (uint8_t*)&solid, 4, + APER_0_BIG_ENDIAN_16BPP_SWAP); + else + /* Fall through for 8 bpp */ +#endif memcpy(info->ExaDriver->memoryBase + exaGetPixmapOffset(pPix), &solid, 4); return pPix; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.9.1/src/r128_probe.c new/xf86-video-r128-6.9.2/src/r128_probe.c --- old/xf86-video-r128-6.9.1/src/r128_probe.c 2012-06-06 12:02:41.000000000 +0200 +++ new/xf86-video-r128-6.9.2/src/r128_probe.c 2013-10-02 20:30:05.000000000 +0200 @@ -379,6 +379,9 @@ NULL, #ifdef XSERVER_LIBPCIACCESS r128_device_match, - r128_pci_probe + r128_pci_probe, +#endif +#ifdef XSERVER_PLATFORM_BUS + NULL #endif }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-r128-6.9.1/src/r128_video.c new/xf86-video-r128-6.9.2/src/r128_video.c --- old/xf86-video-r128-6.9.1/src/r128_video.c 2012-09-28 03:17:47.000000000 +0200 +++ new/xf86-video-r128-6.9.2/src/r128_video.c 2013-10-02 20:30:05.000000000 +0200 @@ -673,7 +673,7 @@ v_inc_shift++; if (pScrn->currentMode->Flags & V_DBLSCAN) v_inc_shift--; - + rmx_active = INREG(R128_FP_VERT_STRETCH) & R128_VERT_STRETCH_ENABLE; if (rmx_active) { v_inc = ((src_h * pScrn->currentMode->CrtcVDisplay / info->PanelYRes) << v_inc_shift) / drw_h; @@ -757,7 +757,7 @@ v_inc_shift++; if (pScrn->currentMode->Flags & V_DBLSCAN) v_inc_shift--; - + rmx_active = INREG(R128_FP_VERT_STRETCH) & R128_VERT_STRETCH_ENABLE; if (rmx_active) { v_inc = ((src_h * pScrn->currentMode->CrtcVDisplay / info->PanelYRes) << v_inc_shift) / drw_h; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
