configure.ac | 2 +- src/r128_driver.c | 2 +- src/r128_exa_render.c | 2 +- src/r128_probe.c | 5 ++++- src/r128_video.c | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-)
New commits: commit ccdfcf5c05ccade823c9734212dcb865d8958cbb Author: Tormod Volden <debian.tor...@gmail.com> Date: Wed Oct 2 20:36:38 2013 +0200 r128: bump to version 6.9.2 Signed-off-by: Tormod Volden <debian.tor...@gmail.com> diff --git a/configure.ac b/configure.ac index 38dc9bd..56554ec 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) commit 255cf857af35e4024486cbc2693872d020f09a29 Author: Connor Behan <connor.be...@gmail.com> 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 <connor.be...@gmail.com> diff --git a/src/r128_probe.c b/src/r128_probe.c index 15e4a77..7f1fbda 100644 --- a/src/r128_probe.c +++ b/src/r128_probe.c @@ -379,6 +379,9 @@ _X_EXPORT DriverRec R128 = NULL, #ifdef XSERVER_LIBPCIACCESS r128_device_match, - r128_pci_probe + r128_pci_probe, +#endif +#ifdef XSERVER_PLATFORM_BUS + NULL #endif }; commit a98077959a65dfda1db900373969bd08479d3e43 Author: Connor Behan <connor.be...@gmail.com> 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 <connor.be...@gmail.com> diff --git a/src/r128_driver.c b/src/r128_driver.c index f47c7e3..72d9e3c 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -2269,7 +2269,7 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL) #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 diff --git a/src/r128_exa_render.c b/src/r128_exa_render.c index f31bdf3..f00536e 100644 --- a/src/r128_exa_render.c +++ b/src/r128_exa_render.c @@ -102,7 +102,7 @@ R128SolidPixmap(ScreenPtr pScreen, uint32_t solid) 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, diff --git a/src/r128_video.c b/src/r128_video.c index bb5a655..dccaa42 100644 --- a/src/r128_video.c +++ b/src/r128_video.c @@ -673,7 +673,7 @@ R128DisplayVideo422( 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 @@ R128DisplayVideo420( 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, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vrpmr-0003f6...@vasks.debian.org