xserver-xorg-video-siliconmotion: Changes to 'upstream-unstable'
.gitignore | 73 ++++++++++++++++++++++++++++++++++++++++++++++++-------
Makefile.am | 11 ++++----
configure.ac | 53 ++++++++++++++++-----------------------
man/Makefile.am | 64 +++++++++++++++++-------------------------------
src/Makefile.am | 4 ++-
src/smi.h | 2 -
src/smi_crtc.c | 6 +++-
src/smi_driver.c | 24 +++++++++---------
src/smi_output.c | 2 -
src/smi_video.c | 67 +++++++++++++++++++++++++++-----------------------
10 files changed, 174 insertions(+), 132 deletions(-)
New commits:
commit 087226bf4e442b83985078f5df481eb91f4f65ed
Author: Julien Cristau <jcristau@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 <jcristau@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 <jcristau@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;
ptrAdaptors = &newAdaptor;
} else {
- newAdaptors = xalloc((numAdaptors + 1) *
+ newAdaptors = malloc((numAdaptors + 1) *
sizeof(XF86VideoAdaptorPtr*));
if (newAdaptors != NULL) {
memcpy(newAdaptors, ptrAdaptors,
@@ -648,9 +648,7 @@ SMI_InitVideo(ScreenPtr pScreen)
xf86XVScreenInit(pScreen, ptrAdaptors, numAdaptors);
}
- if (newAdaptors != NULL) {
- xfree(newAdaptors);
- }
+ free(newAdaptors);
LEAVE();
}
@@ -824,7 +822,7 @@ SMI_SetupVideo(ScreenPtr pScreen)
ENTER();
- ptrAdaptor = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
+ ptrAdaptor = calloc(1, sizeof(XF86VideoAdaptorRec) +
sizeof(DevUnion) + sizeof(SMI_PortRec));
if (ptrAdaptor == NULL)
LEAVE(NULL);
@@ -2164,7 +2162,7 @@ SMI_InitOffscreenImages(
ENTER();
- offscreenImages = xalloc(sizeof(XF86OffscreenImageRec));
+ offscreenImages = malloc(sizeof(XF86OffscreenImageRec));
if (offscreenImages == NULL) {
LEAVE();
}
@@ -2377,22 +2375,22 @@ SMI_AllocSurface(
if (offset == 0)
LEAVE(BadAlloc);
- surface->pitches = xalloc(sizeof(int));
+ surface->pitches = malloc(sizeof(int));
if (surface->pitches == NULL) {
SMI_FreeMemory(pScrn, surface_memory);
LEAVE(BadAlloc);
}
- surface->offsets = xalloc(sizeof(int));
+ surface->offsets = malloc(sizeof(int));
if (surface->offsets == NULL) {
- xfree(surface->pitches);
+ free(surface->pitches);
SMI_FreeMemory(pScrn, surface_memory);
LEAVE(BadAlloc);
}
- ptrOffscreen = xalloc(sizeof(SMI_OffscreenRec));
+ ptrOffscreen = malloc(sizeof(SMI_OffscreenRec));
if (ptrOffscreen == NULL) {
- xfree(surface->offsets);
- xfree(surface->pitches);
+ free(surface->offsets);
+ free(surface->pitches);
SMI_FreeMemory(pScrn, surface_memory);
LEAVE(BadAlloc);
}
@@ -2426,9 +2424,9 @@ SMI_FreeSurface(
}
SMI_FreeMemory(pScrn, ptrOffscreen->surface_memory);
- xfree(surface->pitches);
- xfree(surface->offsets);
- xfree(surface->devPrivate.ptr);
+ free(surface->pitches);
+ free(surface->offsets);
+ free(surface->devPrivate.ptr);
LEAVE(Success);
}
commit 312540ac447acaf80db7e341aa75f90f3e821438
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 27 15:52:33 2011 +0100
Fix compiler warning on 64bit
src/smi_driver.c: In function ‘SMI_MapMem’:
src/smi_driver.c:1498: warning: format ‘%08lX’ expects type ‘long unsigned int’, but argument 6 has type ‘CARD32’
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/smi_driver.c b/src/smi_driver.c
index b736637..093c87d 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -1495,7 +1495,7 @@ SMI_MapMem(ScrnInfoPtr pScrn)
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, VERBLEV,
"Physical frame buffer at 0x%08lX offset: 0x%08lX\n",
- pScrn->memPhysBase, pSmi->fbMapOffset);
+ pScrn->memPhysBase, (unsigned long)pSmi->fbMapOffset);
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, VERBLEV,
"Logical frame buffer at %p - %p\n", pSmi->FBBase,
pSmi->FBBase + pSmi->videoRAMBytes - 1);
commit 6008906f0e328180b17e7b604b97dfdfd4280508
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 27 15:46:13 2011 +0100
Fix build with xserver 1.10
ScrnInfo->pixmapPrivate is gone
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/smi_crtc.c b/src/smi_crtc.c
index bccf9b2..2bcdc0a 100644
--- a/src/smi_crtc.c
+++ b/src/smi_crtc.c
@@ -210,10 +210,12 @@ SMI_CrtcConfigResize(ScrnInfoPtr pScrn,
pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
-1,-1,-1,-1,-1, pSmi->FBBase + pSmi->FBOffset);
+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
if(pScrn->pixmapPrivate.ptr)
/* The pixmap devPrivate just set may be overwritten by
xf86EnableDisableFBAccess */
pScrn->pixmapPrivate.ptr = pSmi->FBBase + pSmi->FBOffset;
+#endif
/* Modify the screen pitch */
pScrn->displayWidth = aligned_pitch / pSmi->Bpp;
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 391efbc..b736637 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -927,7 +927,9 @@ SMI_EnterVT(int scrnIndex, int flags)
/* FBBase may have changed after remapping the memory */
pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
-1,-1,-1,-1,-1, pSmi->FBBase + pSmi->FBOffset);
+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
pScrn->pixmapPrivate.ptr=pSmi->FBBase + pSmi->FBOffset;
+#endif
if(pSmi->useEXA)
pSmi->EXADriverPtr->memoryBase=pSmi->FBBase;
commit 903aac1db82e17954b74581019ebb946d5b43fe3
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 30 09:41:07 2010 -0700
Sun's copyrights now belong to Oracle
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 2e308e6..e1182ee 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
# 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.
-#
+#
drivermandir = $(DRIVER_MAN_DIR)
commit 71e61276ac62dfee15b275568084f8b8a55fc661
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements
diff --git a/configure.ac b/configure.ac
index d1bb0ba..e5563d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,7 @@
#
# Process this file with autoconf to produce a configure script
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-siliconmotion],
[1.7.4],
@@ -36,29 +37,30 @@ AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
AM_MAINTAINER_MODE
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
+# Define a configure option for an alternate module directory
AC_ARG_WITH(xorg-module-dir,
AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-# Checks for extensions
+# 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)
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
@@ -75,7 +77,6 @@ AC_CHECK_HEADER(xf86Modes.h,
[XMODES=yes], [XMODES=no], [#include "xorg-server.h"])
CPPFLAGS="$SAVE_CPPFLAGS"
-
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
fi
commit 5cdb9326ab19da691f4a417def47fd0c869cefb7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:07:00 2010 -0400
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index df8c6c5..d1bb0ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,8 +91,9 @@ AC_SUBST([moduledir])
DRIVER_NAME=siliconmotion
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
- Makefile
- src/Makefile
- man/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ man/Makefile
])
+AC_OUTPUT
commit 987c55bc8f69551eea917fba94827ac31c04a49f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:37:41 2010 -0400
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 3906b27..df8c6c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
commit f2569300c0f1b5714b4c4f09d07a16e9434bee00
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:05:23 2010 -0400
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 6d23ca1..3906b27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AC_CONFIG_SRCDIR([Makefile.am])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 6b1d1833b38e1d21760174493e4f8f0af4214574
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 09:27:42 2010 -0400
config: complete AC_INIT m4 quoting
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d4a4809..6d23ca1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-siliconmotion],
- 1.7.4,
+ [1.7.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-siliconmotion)
+ [xf86-video-siliconmotion])
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
commit dc67a8e8fe220697c3dcbca63c9ce0608a75888c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 20:24:42 2010 -0400
config: remove unrequired AC_HEADER_STDC
Autoconf says:
"This macro is obsolescent, as current systems have conforming
header files. New programs need not use this macro".
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 9b2f84a..d4a4809 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,8 +75,6 @@ AC_CHECK_HEADER(xf86Modes.h,
[XMODES=yes], [XMODES=no], [#include "xorg-server.h"])
CPPFLAGS="$SAVE_CPPFLAGS"
-# Checks for header files.
-AC_HEADER_STDC
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
commit 64995ca7f1287493e0616cc6469fdc2465900325
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 19:41:31 2010 -0400
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 0d25017..9b2f84a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ AM_MAINTAINER_MODE
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
commit 9520e4e64fa758eef024feda09cb6435e41db705
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 18:45:19 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 3a5de7d..0d25017 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
#
# Process this file with autoconf to produce a configure script
-AC_PREREQ(2.57)
+AC_PREREQ([2.60])
AC_INIT([xf86-video-siliconmotion],
1.7.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
commit 53cddc508ea0026db04f04772c401010d62d6af3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 16:15:30 2010 -0400
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
diff --git a/configure.ac b/configure.ac
index 733c6e5..3a5de7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,10 +26,10 @@ AC_INIT([xf86-video-siliconmotion],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-siliconmotion)
-# Require xorg-macros 1.4 for XORG_DEFAULT_OPTIONS & XORG_INSTALL
-m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.4)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AC_CONFIG_SRCDIR([Makefile.am])
diff --git a/man/Makefile.am b/man/Makefile.am
index 5f0dd85..2e308e6 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,21 +31,8 @@ EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
commit 8087bc23a7662f1426a8bd6febf0d5d3844e6107
Author: Francisco Jerez <currojerez@riseup.net>
Date: Wed Jun 16 14:59:37 2010 +0200
xv: Make sure we have a CRTC before setting up the overlay.
Fixes a segfault when the destination area is off screen.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Tested-by: Krzysztof Halasa <khc@pm.waw.pl>
diff --git a/src/smi_video.c b/src/smi_video.c
index c2e8868..57587ac 100644
--- a/src/smi_video.c
+++ b/src/smi_video.c
@@ -1060,7 +1060,7 @@ SMI_PutVideo(
if(!xf86_crtc_clip_video_helper(pScrn, &crtc, crtcConf->crtc[0], &dstBox, &x1, &x2, &y1, &y2, clipBoxes, width, height))
LEAVE(Success);
- if(pSmi->Dualhead && crtc == crtcConf->crtc[1])
+ if (crtc != crtcConf->crtc[0])
LEAVE(Success);
/* Transform dstBox to the CRTC coordinates */
@@ -1521,6 +1521,9 @@ SMI_PutImage(
width, height))
LEAVE(Success);
+ if (!crtc)
+ LEAVE(Success);
+
/* Transform dstBox to the CRTC coordinates */
dstBox.x1 -= crtc->x;
dstBox.y1 -= crtc->y;
@@ -2468,6 +2471,9 @@ SMI_DisplaySurface(
&x1, &x2, &y1, &y2, clipBoxes, surface->width, surface->height))
LEAVE(Success);
+ if (!crtc)
+ LEAVE(Success);
+
/* Transform dstBox to the CRTC coordinates */
dstBox.x1 -= crtc->x;
dstBox.y1 -= crtc->y;
commit 2de1f7ae0b4441c1501568358acf2b870bb9dcc6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Apr 27 15:11:35 2010 -0700
xf86-video-siliconmotion 1.7.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 2f6fe7e..733c6e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-siliconmotion],
- 1.7.3,
+ 1.7.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-siliconmotion)
commit 2dd7cd7508b459638a640905f8793ea85f41af82
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Apr 27 15:11:02 2010 -0700
Require xorg-macros 1.4 for XORG_INSTALL
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index f3dbfd5..2f6fe7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,10 +26,10 @@ AC_INIT([xf86-video-siliconmotion],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-siliconmotion)
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require xorg-macros 1.4 for XORG_DEFAULT_OPTIONS & XORG_INSTALL
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.4)
XORG_DEFAULT_OPTIONS
AC_CONFIG_SRCDIR([Makefile.am])
commit b6d8a1adec9f780826090fb923c54f16fd7f9ce7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Apr 27 15:08:36 2010 -0700
Use $(AM_V_GEN) & $(SED) to generate man pages
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 8f2454b..5f0dd85 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,8 +31,6 @@ EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
-SED = sed
-
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
@@ -52,4 +50,4 @@ MAN_SUBSTS = \
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
commit 7510112f30e33cfb9650ee939564f73ff9633bea
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Feb 11 10:08:07 2010 -0500
config: move CWARNFLAGS from configure.ac to Makefile.am
Compiler warning flags should be explicitly set in the makefile
rather than being merged with other packages compiler flags.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index f113864..f3dbfd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,6 @@ AC_HEADER_STDC
if test "x$XSERVER_LIBPCIACCESS" = xyes; then
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
- XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
AM_CONDITIONAL(XMODES, test "x$XMODES" = xyes)
@@ -90,8 +89,6 @@ if test "x$XMODES" = xyes; then
AC_DEFINE(HAVE_XMODES, 1, [X server has new mode code])
fi
-XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
DRIVER_NAME=siliconmotion
diff --git a/src/Makefile.am b/src/Makefile.am
index 811b456..f3ee526 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,9 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@
+
+AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) $(PCIACCESS_CFLAGS)
+
siliconmotion_drv_la_LTLIBRARIES = siliconmotion_drv.la
siliconmotion_drv_la_LDFLAGS = -module -avoid-version
siliconmotion_drv_ladir = @moduledir@/drivers
commit 3f2aaabcdfe339908338dff42aabc1fef47e8694
Author: Cedric Cellier <rixed@happyleptic.org>
Date: Mon Feb 8 11:44:28 2010 +0100
Fix lack of precision in video resizing. #26443
On some videos the last displayed line was wrong. This can
be fixed using LynxEM+ VPR68. Code borrowed from siliconmotion's
in-house driver.
Also fix a typo.
Signed-off-by: Cedric Cellier <rixed@happyleptic.org>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
diff --git a/src/smi_video.c b/src/smi_video.c
index 9bf0e1b..c2e8868 100644
--- a/src/smi_video.c
+++ b/src/smi_video.c
@@ -1103,7 +1103,7 @@ SMI_PutVideo(
vpr00 |= 0x0010000E;
} else {
/*
- Bit 21 = 10: Vertical Interpolation = enabled
+ Bit 21 = 1: Vertical Interpolation = enabled
Bit 24 = 1: Select Video Window I Source Addr = 1
1= Video window I source addr = capture port buffer ?
*/
@@ -1747,7 +1747,7 @@ SMI_DisplayVideo(
{
SMIPtr pSmi = SMIPTR(pScrn);
CARD32 vpr00;
- int hstretch, vstretch;
+ uint32_t hstretch, vstretch;
ENTER();
@@ -1774,13 +1774,13 @@ SMI_DisplayVideo(
}
if (drw_w > vid_w) {
- hstretch = (2560 * vid_w / drw_w + 5) / 10;
+ hstretch = ((uint32_t)(vid_w - 1) << 16) / (drw_w - 1);
} else {
hstretch = 0;
}
if (drw_h > vid_h) {
- vstretch = (2560 * vid_h / drw_h + 5) / 10;
+ vstretch = ((uint32_t)(vid_h - 1) << 16) / (drw_h - 1);
vpr00 |= 1 << 21;
} else {
vstretch = 0;
@@ -1791,7 +1791,10 @@ SMI_DisplayVideo(
WRITE_VPR(pSmi, 0x18, (dstBox->x2) | (dstBox->y2 << 16));
WRITE_VPR(pSmi, 0x1C, offset >> 3);
WRITE_VPR(pSmi, 0x20, (pitch >> 3) | ((pitch >> 3) << 16));
- WRITE_VPR(pSmi, 0x24, (hstretch << 8) | vstretch);
+ WRITE_VPR(pSmi, 0x24, (hstretch & 0xff00) | ((vstretch & 0xff00) >> 8));
+ if (pSmi->Chipset == SMI_LYNXEMplus) { /* This one can store additional precision */
+ WRITE_VPR(pSmi, 0x68, ((hstretch & 0xff) << 8) | (vstretch & 0xff));
+ }
LEAVE();
}
commit 6bf8f8d7e13ccbb773765c4fcdcaf6d1d2993122
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 13:50:43 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index f0eb29b..8f2454b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,27 +1,24 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-#
-# The above copyright notice and this permission notice 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 OPEN GROUP 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.
-#
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# 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.
#
drivermandir = $(DRIVER_MAN_DIR)
commit 6650644b51947c0c13e71b0fa01f795e997ab750
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 22:01:02 2009 -0500
configure.ac: remove unused sdkdir=$(pkg-config...) statement
The sdkdir variable isn't use, so remove the statement.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d8f8864..f113864 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,6 @@ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
HAVE_XEXTPROTO_71="no")
AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
SAVE_CPPFLAGS="$CPPFLAGS"
commit e8e1d7d22aee2b6aa7caecf910b616a8e39ac061
Reply to: