README | 2 - configure.ac | 64 +++++++++++++++++++++-------------- man/Makefile.am | 21 ++--------- src/Makefile.am | 1 src/compat-api.h | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/smi.h | 6 +++ src/smi_crtc.c | 6 ++- src/smi_driver.c | 73 ++++++++++++++++++++++------------------ src/smi_exa.c | 20 +++++------ src/smi_output.c | 2 - src/smi_video.c | 80 +++++++++++++++++++++----------------------- src/smi_xaa.c | 12 ++++++ src/smilynx_hw.c | 2 - 13 files changed, 257 insertions(+), 131 deletions(-)
New commits: commit 2beb25bd41508ab5e2af39c696485fcb5f0ca7d6 Author: Dave Airlie <airl...@redhat.com> Date: Tue Jul 17 16:05:09 2012 +1000 xf86-video-siliconmotion: bump to version 1.7.7 Signed-off-by: Dave Airlie <airl...@redhat.com> diff --git a/configure.ac b/configure.ac index f5e1dfe..da5ecfd 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-siliconmotion], - [1.7.6], + [1.7.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion], [xf86-video-siliconmotion]) commit 4b4b8e9c047bd34c516ca8ab2b15fd1c541d05d5 Author: Dave Airlie <airl...@redhat.com> Date: Tue Jul 17 14:53:30 2012 +1000 smi: convert to new X server screen conversion apis. Signed-off-by: Dave Airlie <airl...@redhat.com> diff --git a/src/smi_driver.c b/src/smi_driver.c index 604b675..4794571 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -1887,7 +1887,7 @@ SMI_FreeScreen(FREE_SCREEN_ARGS_DECL) static Bool SMI_SaveScreen(ScreenPtr pScreen, int mode) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); ENTER(); diff --git a/src/smi_exa.c b/src/smi_exa.c index 5103924..70298ed 100644 --- a/src/smi_exa.c +++ b/src/smi_exa.c @@ -91,7 +91,7 @@ SMI_DoneComposite(PixmapPtr pDst); Bool SMI_EXAInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SMIPtr pSmi = SMIPTR(pScrn); ENTER(); @@ -187,7 +187,7 @@ SMI_EXAInit(ScreenPtr pScreen) static void SMI_EXASync(ScreenPtr pScreen, int marker) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); ENTER(); @@ -222,7 +222,7 @@ static Bool SMI_PrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir, int ydir, int alu, Pixel planemask) { - ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pDstPixmap->drawable.pScreen); SMIPtr pSmi = SMIPTR(pScrn); int src_pitch, dst_pitch; unsigned long src_offset, dst_offset; @@ -289,7 +289,7 @@ static void SMI_Copy(PixmapPtr pDstPixmap, int srcX, int srcY, int dstX, int dstY, int width, int height) { - ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pDstPixmap->drawable.pScreen); SMIPtr pSmi = SMIPTR(pScrn); ENTER(); @@ -367,7 +367,7 @@ CARD8 SMI_SolidRop[16] = /* table stolen from KAA */ static Bool SMI_PrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg) { - ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen); SMIPtr pSmi = SMIPTR(pScrn); int dst_pitch; unsigned long dst_offset; @@ -437,7 +437,7 @@ SMI_PrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg) static void SMI_Solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2) { - ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen); SMIPtr pSmi = SMIPTR(pScrn); int w, h; @@ -509,7 +509,7 @@ Bool SMI_UploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int src_pitch) { - ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen); SMIPtr pSmi = SMIPTR(pScrn); int dst_pixelpitch, src_pixelpitch, align, aligned_pitch; unsigned long dst_offset; @@ -621,7 +621,7 @@ static Bool SMI_PrepareComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture, PicturePtr pDstPicture, PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst) { - ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen); SMIPtr pSmi = SMIPTR(pScrn); int src_pitch = exaGetPixmapPitch(pSrc) / (pSrc->drawable.bitsPerPixel >> 3); int dst_pitch = exaGetPixmapPitch(pDst) / (pDst->drawable.bitsPerPixel >> 3); @@ -671,7 +671,7 @@ static void SMI_Composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, int dstX, int dstY, int width, int height) { - ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen); SMIPtr pSmi = SMIPTR(pScrn); PictTransformPtr t = pSmi->renderTransform; PictVector v; @@ -711,7 +711,7 @@ static void SMI730_Composite(PixmapPtr pDst, int srcX, int srcY, int maskX, int maskY, int dstX, int dstY, int width, int height) { - ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pDst->drawable.pScreen); SMIPtr pSmi = SMIPTR(pScrn); int maxPixels; diff --git a/src/smi_video.c b/src/smi_video.c index 9d8b35f..7900b3e 100644 --- a/src/smi_video.c +++ b/src/smi_video.c @@ -611,7 +611,7 @@ SMI_BuildEncodings(SMI_PortPtr p) void SMI_InitVideo(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); XF86VideoAdaptorPtr *ptrAdaptors, *newAdaptors = NULL; XF86VideoAdaptorPtr newAdaptor = NULL; int numAdaptors; @@ -814,7 +814,7 @@ SetAttrSAA7111(ScrnInfoPtr pScrn, int i, int value) static XF86VideoAdaptorPtr SMI_SetupVideo(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SMIPtr pSmi = SMIPTR(pScrn); SMI_PortPtr smiPortPtr; XF86VideoAdaptorPtr ptrAdaptor; @@ -2150,7 +2150,7 @@ SMI_InitOffscreenImages( ) { XF86OffscreenImagePtr offscreenImages; - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SMIPtr pSmi = SMIPTR(pScrn); SMI_PortPtr pPort = (SMI_PortPtr) pSmi->ptrAdaptor->pPortPrivates[0].ptr; @@ -2188,7 +2188,7 @@ SMI_InitOffscreenImages( static void SMI_VideoSave(ScreenPtr pScreen, ExaOffscreenArea *area) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SMIPtr pSmi = SMIPTR(pScrn); SMI_PortPtr pPort = pSmi->ptrAdaptor->pPortPrivates[0].ptr; @@ -2203,7 +2203,7 @@ SMI_VideoSave(ScreenPtr pScreen, ExaOffscreenArea *area) CARD32 SMI_AllocateMemory(ScrnInfoPtr pScrn, void **mem_struct, int size) { - ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; + ScreenPtr pScreen = xf86ScrnToScreen(pScrn); SMIPtr pSmi = SMIPTR(pScrn); int offset = 0; diff --git a/src/smi_xaa.c b/src/smi_xaa.c index 95b5c95..a878098 100644 --- a/src/smi_xaa.c +++ b/src/smi_xaa.c @@ -70,7 +70,7 @@ SMI_XAAInit(ScreenPtr pScreen) { #ifdef HAVE_XAA_H XAAInfoRecPtr infoPtr; - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SMIPtr pSmi = SMIPTR(pScrn); /*BoxRec AvailFBArea;*/ Bool ret; commit 1aad7b44e3e141bd8d3e589b7cd410e791050bd0 Author: Dave Airlie <airl...@redhat.com> Date: Tue Jul 17 02:01:07 2012 +0100 smi: port to compat-api for new server. Signed-off-by: Dave Airlie <airl...@redhat.com> diff --git a/src/Makefile.am b/src/Makefile.am index f3ee526..77b3b85 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,6 +31,7 @@ siliconmotion_drv_la_LDFLAGS = -module -avoid-version siliconmotion_drv_ladir = @moduledir@/drivers siliconmotion_drv_la_SOURCES = \ + compat-api.h \ regsmi.h \ smi_501.c \ smi_501.h \ diff --git a/src/compat-api.h b/src/compat-api.h new file mode 100644 index 0000000..6bc946f --- /dev/null +++ b/src/compat-api.h @@ -0,0 +1,99 @@ +/* + * Copyright 2012 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Dave Airlie <airl...@redhat.com> + */ + +/* this file provides API compat between server post 1.13 and pre it, + it should be reused inside as many drivers as possible */ +#ifndef COMPAT_API_H +#define COMPAT_API_H + +#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR +#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] +#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p +#endif + +#ifndef XF86_HAS_SCRN_CONV +#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] +#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] +#endif + +#ifndef XF86_SCRN_INTERFACE + +#define SCRN_ARG_TYPE int +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] + +#define SCREEN_ARG_TYPE int +#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] + +#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask + +#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen +#define CLOSE_SCREEN_ARGS scrnIndex, pScreen + +#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags +#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 + +#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags +#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 + +#define FREE_SCREEN_ARGS_DECL int arg, int flags + +#define VT_FUNC_ARGS_DECL int arg, int flags +#define VT_FUNC_ARGS pScrn->scrnIndex, 0 + +#define XF86_SCRN_ARG(x) ((x)->scrnIndex) +#else +#define SCRN_ARG_TYPE ScrnInfoPtr +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) + +#define SCREEN_ARG_TYPE ScreenPtr +#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) + +#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + +#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen +#define CLOSE_SCREEN_ARGS pScreen + +#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y +#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y + +#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode +#define SWITCH_MODE_ARGS(arg, m) arg, m + +#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg + +#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg +#define VT_FUNC_ARGS pScrn + +#define XF86_SCRN_ARG(x) (x) + +#endif + +#endif diff --git a/src/smi.h b/src/smi.h index db890b7..956c14f 100644 --- a/src/smi.h +++ b/src/smi.h @@ -63,6 +63,7 @@ authorization from the XFree86 Project and Silicon Motion. #include "xf86xv.h" #include <X11/extensions/Xv.h> +#include "compat-api.h" /******************************************************************************/ /* D E F I N I T I O N S */ /******************************************************************************/ diff --git a/src/smi_driver.c b/src/smi_driver.c index 05d7202..604b675 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -72,15 +72,14 @@ static const OptionInfoRec * SMI_AvailableOptions(int chipid, int busid); static void SMI_Identify(int flags); static Bool SMI_Probe(DriverPtr drv, int flags); static Bool SMI_PreInit(ScrnInfoPtr pScrn, int flags); -static Bool SMI_EnterVT(int scrnIndex, int flags); -static void SMI_LeaveVT(int scrnIndex, int flags); -static Bool SMI_ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, - char **argv); +static Bool SMI_EnterVT(VT_FUNC_ARGS_DECL); +static void SMI_LeaveVT(VT_FUNC_ARGS_DECL); +static Bool SMI_ScreenInit(SCREEN_INIT_ARGS_DECL); static void SMI_DisableVideo(ScrnInfoPtr pScrn); static void SMI_EnableVideo(ScrnInfoPtr pScrn); -static Bool SMI_CloseScreen(int scrnIndex, ScreenPtr pScreen); +static Bool SMI_CloseScreen(CLOSE_SCREEN_ARGS_DECL); static Bool SMI_SaveScreen(ScreenPtr pScreen, int mode); -static void SMI_FreeScreen(int ScrnIndex, int flags); +static void SMI_FreeScreen(FREE_SCREEN_ARGS_DECL); static void SMI_ProbeDDC(ScrnInfoPtr pScrn, int index); static void SMI_DetectPanelSize(ScrnInfoPtr pScrn); static void SMI_DetectMCLK(ScrnInfoPtr pScrn); @@ -917,9 +916,9 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) */ static Bool -SMI_EnterVT(int scrnIndex, int flags) +SMI_EnterVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); SMIPtr pSmi = SMIPTR(pScrn); ENTER(); @@ -965,9 +964,9 @@ SMI_EnterVT(int scrnIndex, int flags) */ static void -SMI_LeaveVT(int scrnIndex, int flags) +SMI_LeaveVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); SMIPtr pSmi = SMIPTR(pScrn); ENTER(); @@ -1620,9 +1619,9 @@ SMI_UnmapMem(ScrnInfoPtr pScrn) /* This gets called at the start of each server generation. */ static Bool -SMI_ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +SMI_ScreenInit(SCREEN_INIT_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SMIPtr pSmi = SMIPTR(pScrn); EntityInfoPtr pEnt; @@ -1832,9 +1831,9 @@ SMI_ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) */ static Bool -SMI_CloseScreen(int scrnIndex, ScreenPtr pScreen) +SMI_CloseScreen(CLOSE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SMIPtr pSmi = SMIPTR(pScrn); Bool ret; @@ -1845,7 +1844,7 @@ SMI_CloseScreen(int scrnIndex, ScreenPtr pScreen) if (pScrn->vtSema) /* Restore console mode and unmap framebuffer */ - SMI_LeaveVT(scrnIndex, 0); + SMI_LeaveVT(VT_FUNC_ARGS); #ifdef HAVE_XAA_H if (pSmi->XAAInfoRec != NULL) { @@ -1873,15 +1872,16 @@ SMI_CloseScreen(int scrnIndex, ScreenPtr pScreen) pScrn->vtSema = FALSE; pScreen->CloseScreen = pSmi->CloseScreen; - ret = (*pScreen->CloseScreen)(scrnIndex, pScreen); + ret = (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); LEAVE(ret); } static void -SMI_FreeScreen(int scrnIndex, int flags) +SMI_FreeScreen(FREE_SCREEN_ARGS_DECL) { - SMI_FreeRec(xf86Screens[scrnIndex]); + SCRN_INFO_PTR(arg); + SMI_FreeRec(pScrn); } static Bool diff --git a/src/smi_video.c b/src/smi_video.c index b4511b8..9d8b35f 100644 --- a/src/smi_video.c +++ b/src/smi_video.c @@ -123,8 +123,7 @@ static void SMI_DisplayVideo0501(ScrnInfoPtr pScrn, int id, int offset, static void SMI_DisplayVideo0730(ScrnInfoPtr pScrn, int id, int offset, short width, short height, int pitch, int x1, int y1, int x2, int y2, BoxPtr dstBox, short vid_w, short vid_h, short drw_w, short drw_h); -static void SMI_BlockHandler(int i, pointer blockData, pointer pTimeout, - pointer pReadMask); +static void SMI_BlockHandler(BLOCKHANDLER_ARGS_DECL); /*static int SMI_SendI2C(ScrnInfoPtr pScrn, CARD8 device, char *devName, SMI_I2CDataPtr i2cData);*/ @@ -2060,20 +2059,15 @@ SMI_DisplayVideo0730( } static void -SMI_BlockHandler( - int i, - pointer blockData, - pointer pTimeout, - pointer pReadMask -) +SMI_BlockHandler(BLOCKHANDLER_ARGS_DECL) { - ScreenPtr pScreen = screenInfo.screens[i]; - ScrnInfoPtr pScrn = xf86Screens[i]; + SCREEN_PTR(arg); + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); SMIPtr pSmi = SMIPTR(pScrn); SMI_PortPtr pPort = (SMI_PortPtr) pSmi->ptrAdaptor->pPortPrivates[0].ptr; pScreen->BlockHandler = pSmi->BlockHandler; - (*pScreen->BlockHandler)(i, blockData, pTimeout, pReadMask); + (*pScreen->BlockHandler)(BLOCKHANDLER_ARGS); pScreen->BlockHandler = SMI_BlockHandler; if (pPort->videoStatus & TIMER_MASK) { diff --git a/src/smilynx_hw.c b/src/smilynx_hw.c index 019261d..9a10a31 100644 --- a/src/smilynx_hw.c +++ b/src/smilynx_hw.c @@ -584,7 +584,7 @@ SMILynx_ddc1(ScrnInfoPtr pScrn) tmp = VGAIN8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72); VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp | 0x20); - pMon = xf86PrintEDID(xf86DoEDID_DDC1(pScrn->scrnIndex, + pMon = xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), vgaHWddc1SetSpeedWeak(), SMILynx_ddc1Read)); VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp); commit 891ea02395079b1480faf701156185ad01405e6d Author: Dave Airlie <airl...@redhat.com> Date: Tue Jul 17 01:52:45 2012 +0100 smi: fix build against XAA-less server diff --git a/configure.ac b/configure.ac index 7a80962..f5e1dfe 100644 --- a/configure.ac +++ b/configure.ac @@ -84,6 +84,23 @@ AM_CONDITIONAL(XMODES, test "x$XMODES" = xyes) if test "x$XMODES" = xyes; then AC_DEFINE(HAVE_XMODES, 1, [X server has new mode code]) fi +AC_ARG_ENABLE(xaa, + AS_HELP_STRING([--enable-xaa], + [Enable legacy X Acceleration Architecture (XAA) [default=auto]]), + [XAA="$enableval"], + [XAA=auto]) +if test "x$XAA" != xno; then + save_CFLAGS=$CFLAGS + save_CPPFLAGS=$CPPFLAGS + CFLAGS=$XORG_CFLAGS + CPPFLAGS="$XORG_CFLAGS" + AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no) + CFLAGS=$save_CFLAGS + CPPFLAGS=$save_CPPFLAGS +fi +AC_MSG_CHECKING([whether to include XAA support]) +AM_CONDITIONAL(XAA, test "x$XAA" = xyes) +AC_MSG_RESULT([$XAA]) AC_SUBST([moduledir]) diff --git a/src/smi.h b/src/smi.h index 0f72db9..db890b7 100644 --- a/src/smi.h +++ b/src/smi.h @@ -49,7 +49,10 @@ authorization from the XFree86 Project and Silicon Motion. #include "fb.h" +#ifdef HAVE_XAA_H #include "xaa.h" +#endif +#include "xf86fbman.h" #include "exa.h" #include "xf86cmap.h" #include "xf86i2c.h" @@ -239,7 +242,9 @@ typedef struct printed using a counter */ Bool useBIOS; /* Use BIOS for mode sets */ +#ifdef HAVE_XAA_H XAAInfoRecPtr XAAInfoRec; /* XAA info Rec */ +#endif /* EXA */ ExaDriverPtr EXADriverPtr; diff --git a/src/smi_driver.c b/src/smi_driver.c index 25eb742..05d7202 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -1847,9 +1847,11 @@ SMI_CloseScreen(int scrnIndex, ScreenPtr pScreen) /* Restore console mode and unmap framebuffer */ SMI_LeaveVT(scrnIndex, 0); +#ifdef HAVE_XAA_H if (pSmi->XAAInfoRec != NULL) { XAADestroyInfoRec(pSmi->XAAInfoRec); } +#endif if (pSmi->EXADriverPtr) { exaDriverFini(pScreen); pSmi->EXADriverPtr = NULL; diff --git a/src/smi_xaa.c b/src/smi_xaa.c index f2c1cc6..95b5c95 100644 --- a/src/smi_xaa.c +++ b/src/smi_xaa.c @@ -32,6 +32,8 @@ authorization from the XFree86 Project and silicon Motion. #include "smi.h" #include "smi_501.h" +#ifdef HAVE_XAA_H + #include "miline.h" #include "xaalocal.h" #include "xaarop.h" @@ -62,9 +64,11 @@ static void SMI_SetupForImageWrite(ScrnInfoPtr, int, unsigned int, int, int, static void SMI_SubsequentImageWriteRect(ScrnInfoPtr, int, int, int, int, int); #endif +#endif Bool SMI_XAAInit(ScreenPtr pScreen) { +#ifdef HAVE_XAA_H XAAInfoRecPtr infoPtr; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; SMIPtr pSmi = SMIPTR(pScrn); @@ -187,8 +191,13 @@ SMI_XAAInit(ScreenPtr pScreen) ret = XAAInit(pScreen, infoPtr); LEAVE(ret); +#else + return FALSE; +#endif } + +#ifdef HAVE_XAA_H /******************************************************************************/ /* Screen to Screen Copies */ /******************************************************************************/ @@ -720,3 +729,4 @@ SMI_SubsequentImageWriteRect(ScrnInfoPtr pScrn, int x, int y, int w, int h, LEAVE(); } #endif +#endif commit e4660be7c12de53cac57c0b7d4e792a071b4fcfc Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Fri Mar 23 19:49:14 2012 -0700 xf86-video-siliconmotion 1.7.6 Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> diff --git a/configure.ac b/configure.ac index 4654c64..7a80962 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-siliconmotion], - [1.7.5], + [1.7.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion], [xf86-video-siliconmotion]) commit 63afc35a662bc2dc460f6ff6fab65a8462aa5e76 Author: Matt Turner <matts...@gmail.com> Date: Thu Feb 9 17:14:25 2012 -0500 Add &component=Driver/siliconmotion to Bugzilla link Signed-off-by: Matt Turner <matts...@gmail.com> diff --git a/README b/README index b3b6674..a8840d8 100644 --- a/README +++ b/README @@ -7,7 +7,7 @@ Xorg mailing list: Please submit bug reports to the Xorg bugzilla: - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion The master development code repository can be found at: diff --git a/configure.ac b/configure.ac index aa8f4b9..4654c64 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AC_PREREQ([2.60]) AC_INIT([xf86-video-siliconmotion], [1.7.5], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/siliconmotion], [xf86-video-siliconmotion]) # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS commit 12695ed1edd8c590252e76d530bcecaa0036e109 Author: Matt Turner <matts...@gmail.com> Date: Thu Feb 9 16:21:59 2012 -0500 Don't check for randrproto or renderproto The driver supports neither randr or render. Signed-off-by: Matt Turner <matts...@gmail.com> diff --git a/configure.ac b/configure.ac index 9890a76..aa8f4b9 100644 --- a/configure.ac +++ b/configure.ac @@ -55,8 +55,6 @@ AC_ARG_WITH(xorg-module-dir, [moduledir="$libdir/xorg/modules"]) # Store the list of server defined optional extensions in REQUIRED_MODULES -XORG_DRIVER_CHECK_EXT(RANDR, randrproto) -XORG_DRIVER_CHECK_EXT(RENDER, renderproto) XORG_DRIVER_CHECK_EXT(XV, videoproto) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) commit 0e7e9cd639196cb42b0a79b2671f6bacc558035f Author: Adam Jackson <a...@redhat.com> Date: Mon Dec 19 17:26:34 2011 -0500 Fix for new vgaHW ABI Signed-off-by: Adam Jackson <a...@redhat.com> diff --git a/src/smi_driver.c b/src/smi_driver.c index a344921..25eb742 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -442,6 +442,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) LEAVE(FALSE); hwp = VGAHWPTR(pScrn); + vgaHWSetStdFuncs(hwp); #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 pSmi->PIOBase = hwp->PIOOffset; #else commit 208a703776d6dfbd01babbe2f220a7198dea4f5c Author: Adam Jackson <a...@redhat.com> Date: Mon Dec 19 17:25:39 2011 -0500 Make failure to XAA non-fatal No shadowfb support in this driver yet. Signed-off-by: Adam Jackson <a...@redhat.com> diff --git a/src/smi_driver.c b/src/smi_driver.c index 6508fae..a344921 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -879,8 +879,8 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) if (!pSmi->NoAccel) { if (!pSmi->useEXA) { if (!xf86LoadSubModule(pScrn, "xaa")) { - SMI_FreeRec(pScrn); - LEAVE(FALSE); + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No acceleration\n"); + pSmi->NoAccel = 1; } } else { XF86ModReqInfo req; commit 7d9c1a49b87df15cdb78c529db554ea82c77033f Author: Adam Jackson <a...@redhat.com> Date: Thu Nov 17 15:53:51 2011 -0500 Check ABI major not encoded ABI Signed-off-by: Adam Jackson <a...@redhat.com> diff --git a/src/smi_driver.c b/src/smi_driver.c index 86644c7..6508fae 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -442,7 +442,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) LEAVE(FALSE); hwp = VGAHWPTR(pScrn); -#if ABI_VIDEODRV_VERSION < 12 +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 pSmi->PIOBase = hwp->PIOOffset; #else pSmi->PIOBase = 0; commit 037b839c84ad6dcbe9aade420cf0d3bf06f23119 Author: Adam Jackson <a...@redhat.com> Date: Wed Nov 16 15:03:25 2011 -0500 Adapt to missing PIOOffset in videoabi 12 Signed-off-by: Adam Jackson <a...@redhat.com> diff --git a/src/smi_driver.c b/src/smi_driver.c index 9c10e46..86644c7 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -442,7 +442,11 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) LEAVE(FALSE); hwp = VGAHWPTR(pScrn); +#if ABI_VIDEODRV_VERSION < 12 pSmi->PIOBase = hwp->PIOOffset; +#else + pSmi->PIOBase = 0; +#endif xf86ErrorFVerb(VERBLEV, "\tSMI_PreInit vgaCRIndex=%x, vgaIOBase=%x, " "MMIOBase=%p\n", hwp->IOBase + VGA_CRTC_INDEX_OFFSET, commit 087226bf4e442b83985078f5df481eb91f4f65ed Author: Julien Cristau <jcris...@debian.org> Date: Sun Feb 27 17:12:58 2011 +0100 Bump to 1.7.5 diff --git a/configure.ac b/configure.ac index e5563d5..9890a76 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-siliconmotion], - [1.7.4], + [1.7.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-siliconmotion]) commit b20cfa3d4f531b612a28ea88e5f5a6b1df183ea0 Author: Julien Cristau <jcris...@debian.org> Date: Sun Feb 27 15:49:12 2011 +0100 Replace calls to xalloc/xcalloc/xfree with malloc/calloc/free Also don't check for NULL before calling free(). Signed-off-by: Julien Cristau <jcris...@debian.org> diff --git a/src/smi_crtc.c b/src/smi_crtc.c index 2bcdc0a..e82f2d8 100644 --- a/src/smi_crtc.c +++ b/src/smi_crtc.c @@ -170,8 +170,8 @@ SMI_CrtcDestroy (xf86CrtcPtr crtc) { ENTER(); - xfree(SMICRTC(crtc)); - xfree(crtc->funcs); + free(SMICRTC(crtc)); + free((xf86CrtcFuncsPtr)crtc->funcs); LEAVE(); } diff --git a/src/smi_driver.c b/src/smi_driver.c index 093c87d..9c10e46 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -281,9 +281,9 @@ SMI_FreeRec(ScrnInfoPtr pScrn) ENTER(); if (pSmi) { - xfree(pSmi->save); - xfree(pSmi->mode); - xfree(pScrn->driverPrivate); + free(pSmi->save); + free(pSmi->mode); + free(pScrn->driverPrivate); pScrn->driverPrivate = NULL; } @@ -338,7 +338,7 @@ SMI_Probe(DriverPtr drv, int flags) numDevSections, drv, &usedChips); /* Free it since we don't need that list after this */ - xfree(devSections); + free(devSections); if (numUsed <= 0) LEAVE(FALSE); @@ -364,14 +364,14 @@ SMI_Probe(DriverPtr drv, int flags) if ((pEnt = xf86GetEntityInfo(usedChips[i]))) { pScrn->EnterVT = SMI_EnterVT; pScrn->LeaveVT = SMI_LeaveVT; - xfree(pEnt); + free(pEnt); } pScrn->FreeScreen = SMI_FreeScreen; foundScreen = TRUE; } } } - xfree(usedChips); + free(usedChips); LEAVE(foundScreen); } @@ -421,7 +421,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) } if (pEnt->location.type != BUS_PCI) { - xfree(pEnt); + free(pEnt); SMI_FreeRec(pScrn); LEAVE(FALSE); } @@ -519,7 +519,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) } /* Process the options */ - if (!(pSmi->Options = xalloc(sizeof(SMIOptions)))) + if (!(pSmi->Options = malloc(sizeof(SMIOptions)))) LEAVE(FALSE); memcpy(pSmi->Options, SMIOptions, sizeof(SMIOptions)); @@ -662,7 +662,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) } else pSmi->ChipRev = PCI_DEV_REVISION(pSmi->PciInfo); - xfree(pEnt); + free(pEnt); /* * This shouldn't happen because such problems should be caught in @@ -1858,7 +1858,7 @@ SMI_CloseScreen(int scrnIndex, ScreenPtr pScreen) pSmi->pInt10 = NULL; } if (pSmi->ptrAdaptor != NULL) { - xfree(pSmi->ptrAdaptor); + free(pSmi->ptrAdaptor); } if (pSmi->BlockHandler != NULL) { pScreen->BlockHandler = pSmi->BlockHandler; diff --git a/src/smi_output.c b/src/smi_output.c index bbc3f5c..faf6a32 100644 --- a/src/smi_output.c +++ b/src/smi_output.c @@ -156,7 +156,7 @@ SMI_OutputDestroy(xf86OutputPtr output) { ENTER(); - xfree(output->funcs); + free((xf86OutputFuncsPtr)output->funcs); LEAVE(); } diff --git a/src/smi_video.c b/src/smi_video.c index 57587ac..b4511b8 100644 --- a/src/smi_video.c +++ b/src/smi_video.c @@ -520,7 +520,7 @@ SMI_AddEncoding(XF86VideoEncodingPtr enc, int i, input_string = VideoInputs[input].name; sprintf(channel_string, "%d", channel); enc[i].id = i; - enc[i].name = xalloc(strlen(norm_string) + + enc[i].name = malloc(strlen(norm_string) + strlen(input_string) + strlen(channel_string)+3); if (NULL == enc[i].name) @@ -547,22 +547,22 @@ SMI_BuildEncodings(SMI_PortPtr p) ENTER(); /* allocate memory for encoding array */ - p->enc = xalloc(sizeof(XF86VideoEncodingRec) * N_ENCODINGS); + p->enc = malloc(sizeof(XF86VideoEncodingRec) * N_ENCODINGS); if (NULL == p->enc) goto fail; memset(p->enc,0,sizeof(XF86VideoEncodingRec) * N_ENCODINGS); /* allocate memory for video norm array */ - p->norm = xalloc(sizeof(int) * N_ENCODINGS); + p->norm = malloc(sizeof(int) * N_ENCODINGS); if (NULL == p->norm) goto fail; memset(p->norm,0,sizeof(int) * N_ENCODINGS); /* allocate memory for video input format array */ - p->input = xalloc(sizeof(int) * N_ENCODINGS); + p->input = malloc(sizeof(int) * N_ENCODINGS); if (NULL == p->input) goto fail; memset(p->input,0,sizeof(int) * N_ENCODINGS); /* allocate memory for video channel number array */ - p->channel = xalloc(sizeof(int) * N_ENCODINGS); + p->channel = malloc(sizeof(int) * N_ENCODINGS); if (NULL == p->channel) goto fail; memset(p->channel,0,sizeof(int) * N_ENCODINGS); @@ -590,13 +590,13 @@ SMI_BuildEncodings(SMI_PortPtr p) LEAVE(); fail: - if (p->input) xfree(p->input); + free(p->input); p->input = NULL; - if (p->norm) xfree(p->norm); + free(p->norm); p->norm = NULL; - if (p->channel) xfree(p->channel); + free(p->channel); p->channel = NULL; - if (p->enc) xfree(p->enc); + free(p->enc); p->enc = NULL; p->nenc = 0; LEAVE(); @@ -632,7 +632,7 @@ SMI_InitVideo(ScreenPtr pScreen) numAdaptors = 1; -- 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/e1srofq-0005xp...@vasks.debian.org