xserver-xorg-video-glint: Changes to 'upstream-experimental'
.gitignore | 70 ++++++++++++++-
COPYING | 109 ++++++++++++++++++++++--
ChangeLog | 101 ----------------------
Makefile.am | 12 ++
README | 20 ++++
configure.ac | 54 ++++++------
man/.gitignore | 2
man/Makefile.am | 59 ++++---------
man/glint.man | 2
src/.gitignore | 6 -
src/Makefile.am | 2
src/glint.h | 1
src/glint_dga.c | 6 -
src/glint_dri.c | 26 ++---
src/glint_driver.c | 233 +++++++----------------------------------------------
src/glint_shadow.c | 1
src/pm2_video.c | 22 ++---
src/pm3_accel.c | 4
src/pm3_dac.c | 4
src/pm3_video.c | 22 ++---
src/pm_accel.c | 4
src/sx_accel.c | 2
src/tx_accel.c | 4
23 files changed, 323 insertions(+), 443 deletions(-)
New commits:
commit 7050a255115b2c5a70083d2d4ad775548ef701f7
Author: Matt Turner <mattst88@gmail.com>
Date: Sat Sep 11 16:22:23 2010 -0400
xf86-video-glint 1.2.5
diff --git a/configure.ac b/configure.ac
index 5f04bcb..450005b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-glint],
- [1.2.4],
+ [1.2.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-glint])
AC_CONFIG_SRCDIR([Makefile.am])
commit a2fa84df74b2c799b4bf992a212fa7c06dfa919f
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 cb96399..5f04bcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,18 +20,18 @@
#
# Process this file with autoconf to produce a configure script
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-glint],
[1.2.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-glint])
-
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
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@@ -40,12 +40,13 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-# 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]]]),
@@ -57,14 +58,14 @@ AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
[DRI="$enableval"],
[DRI=auto])
-# 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)
XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
-# 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]),
commit ebd5eec763716b34f9c5759c9214c068e85c1ed7
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 f8cd3cc..cb96399 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,8 +122,9 @@ AC_SUBST([moduledir])
DRIVER_NAME=glint
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
- Makefile
- src/Makefile
- man/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ man/Makefile
])
+AC_OUTPUT
commit d4af4770f292539395ef9513fa3c7da6264ea90f
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 b162b67..f8cd3cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,12 +47,12 @@ 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"])
-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
[Disable DRI support [[default=auto]]]),
[DRI="$enableval"],
[DRI=auto])
commit 9d2fe6766e9a4e48bbac0e6b2aa394f45859c460
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:05:22 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 651936b..b162b67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([xf86-video-glint],
[xf86-video-glint])
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 361ff8746407ec90a03e5c5bc43b3ddcd37a5162
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 10e1e33..651936b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-glint],
- 1.2.4,
+ [1.2.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-glint)
+ [xf86-video-glint])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
commit e98573f1167fd29f1a6ea4a6324eba4bb8c91468
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 21:54:11 2010 -0400
config: remove unrequired AC_SUBST([DRI_CFLAGS])
This macro is called by PKG_CHECK_MODULES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index b308b66..10e1e33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,7 +117,6 @@ fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-AC_SUBST([DRI_CFLAGS])
AC_SUBST([moduledir])
DRIVER_NAME=glint
commit 819acac0a1613296b3a15176e0061336bd99c120
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 21:44:57 2010 -0400
config: remove unrequired AC_SUBST([XORG_CFLAGS])
This macro is called by PKG_CHECK_MODULES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 14bc393..b308b66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,7 +118,6 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
AC_SUBST([DRI_CFLAGS])
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
DRIVER_NAME=glint
commit 9bdca08b4d3728fb7addf2d7aa4c6288e3ad80f3
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 10b7830..14bc393 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,8 +81,6 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
AC_CHECK_HEADER(cfb8_32.h,[AC_DEFINE(HAVE_CFB8_32, 1, [Have cfb8_32 support])],[])
CPPFLAGS="$SAVE_CPPFLAGS"
-# Checks for header files.
-AC_HEADER_STDC
if test "$DRI" != no; then
AC_CHECK_FILE([${sdkdir}/dri.h],
commit 2bfc9d4232fffcef0a61ad55683c0b8f517c281e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 19:41:30 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 bffb742..10b7830 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
-AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
commit 7706c011e7b46b76ea91467f9446523458e0a8d9
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 505389d..bffb742 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-glint],
1.2.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
commit 4582c1f184ed3718caed0b73e71f5198e8d4b8a6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 16:15:29 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 770c7cf..505389d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# 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.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Checks for programs.
diff --git a/man/Makefile.am b/man/Makefile.am
index 8f2454b..b3688ce 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
-SED = sed
-
-# 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
.man.$(DRIVER_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
commit b2590514c4cb76d571e40dbab3e9bff357aaa461
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jun 12 15:59:54 2010 -0400
COPYING: replace stub file with actual Copyright notices.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 7f33cbf..f191f20 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,105 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+All Rights Reserved.
-Please submit updated COPYING files to the Xorg bugzilla:
+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:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+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
+PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+
+Copyright 2000-2001 by Alan Hourihane, Sychdyn, North Wales, UK.
+
+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, and that the name of Alan Hourihane not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Alan Hourihane makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 1997-2001 by Alan Hourihane, Wigan, England.
+
+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, and that the name of Alan Hourihane not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Alan Hourihane makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 2007 George Sapountzis
+
+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.
+
+Copyright 2000,2001 by Sven Luther <luther@dpt-info.u-strasbg.fr>.
+
+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, and that the name of Sven Luther not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Sven Luther makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+SVEN LUTHER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL SVEN LUTHER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-http://lists.freedesktop.org/mailman/listinfo/xorg
commit b333d1751eab5aaff9fb5764c4b7b6250f78d145
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Jun 9 01:56:27 2010 -0400
Remove another superfluous if(p) check around free(p)
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/src/pm2_video.c b/src/pm2_video.c
index c9f6c05..58e4541 100644
--- a/src/pm2_video.c
+++ b/src/pm2_video.c
@@ -183,10 +183,8 @@ static AdaptorPrivPtr AdaptorPrivList = NULL;
#define FreeCookies(pPPriv) \
do { \
- if ((pPPriv)->pCookies) { \
- free((pPPriv)->pCookies); \
+ free((pPPriv)->pCookies); \
(pPPriv)->pCookies = NULL; \
- } \
} while (0)
#define PORTNUM(p) ((int)((p) - &pAPriv->Port[0]))
commit 415b727c6a91bd788436f848bd7828930f2019e2
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Jun 9 01:26:50 2010 -0400
Move mem_barrier() outside of loop
This makes more sense, and is also how the pm3fb driver in the kernel
does it.
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/src/pm3_dac.c b/src/pm3_dac.c
index f2dfb5e..34c3a00 100644
--- a/src/pm3_dac.c
+++ b/src/pm3_dac.c
@@ -115,8 +115,9 @@ Permedia3MemorySizeDetect(ScrnInfoPtr pScrn)
for(i=0;i<32;i++) {
/* Clear first 32MB */
MMIO_OUT32(pGlint->FbBase, i*1024*1024, 0);
- mem_barrier();
}
+ mem_barrier();
+
for(i=32;i<64;i++) {
/* write test pattern */
MMIO_OUT32(pGlint->FbBase, i*1024*1024, i*0x00345678);
commit c8a03b63945a358bd895590a8ed2b817b9f08ce9
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Jun 9 01:23:36 2010 -0400
Remove superfluous if(p) checks around free(p)
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/src/glint_dri.c b/src/glint_dri.c
index e2ea264..4e4e71d 100644
--- a/src/glint_dri.c
+++ b/src/glint_dri.c
@@ -817,14 +817,12 @@ GLINTDRICloseScreen(ScreenPtr pScreen)
DRICloseScreen(pScreen);
if (pGlint->pDRIInfo) {
- if (pGlint->pDRIInfo->devPrivate) {
- free(pGlint->pDRIInfo->devPrivate);
- }
+ free(pGlint->pDRIInfo->devPrivate);
DRIDestroyInfoRec(pGlint->pDRIInfo);
}
- if (pGlint->pVisualConfigs) free(pGlint->pVisualConfigs);
- if (pGlint->pVisualConfigsPriv) free(pGlint->pVisualConfigsPriv);
+ free(pGlint->pVisualConfigs);
+ free(pGlint->pVisualConfigsPriv);
}
Bool
diff --git a/src/glint_driver.c b/src/glint_driver.c
index 4bd922a..ffafc39 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -3375,12 +3375,9 @@ GLINTCloseScreen(int scrnIndex, ScreenPtr pScreen)
XAADestroyInfoRec(pGlint->AccelInfoRec);
if(pGlint->CursorInfoRec)
xf86DestroyCursorInfoRec(pGlint->CursorInfoRec);
- if (pGlint->ShadowPtr)
- free(pGlint->ShadowPtr);
- if (pGlint->DGAModes)
- free(pGlint->DGAModes);
- if (pGlint->ScratchBuffer)
- free(pGlint->ScratchBuffer);
+ free(pGlint->ShadowPtr);
+ free(pGlint->DGAModes);
+ free(pGlint->ScratchBuffer);
pScrn->vtSema = FALSE;
if (xf86IsPc98())
diff --git a/src/pm3_video.c b/src/pm3_video.c
index 59a9ea2..6b4ad59 100644
--- a/src/pm3_video.c
+++ b/src/pm3_video.c
@@ -112,8 +112,7 @@ void Permedia3InitVideo(ScreenPtr pScreen)
if(num_adaptors)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- if(newAdaptors)
- free(newAdaptors);
+ free(newAdaptors);
}
/* client libraries expect an encoding */
commit 610703a0453e30354aae959a914200ca33012b4a
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Jun 9 01:20:21 2010 -0400
Use libc instead of deprecated libc wrappers for malloc/calloc/free.
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/src/glint_dga.c b/src/glint_dga.c
index 66ed15a..8feb6c2 100644
--- a/src/glint_dga.c
+++ b/src/glint_dga.c
@@ -75,15 +75,15 @@ GLINTDGAInit(ScreenPtr pScreen)
while(pMode) {
if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
- newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
oneMore = TRUE;
} else {
- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
oneMore = FALSE;
}
if(!newmodes) {
- xfree(modes);
+ free(modes);
return FALSE;
}
modes = newmodes;
diff --git a/src/glint_dri.c b/src/glint_dri.c
index b244b73..e2ea264 100644
--- a/src/glint_dri.c
+++ b/src/glint_dri.c
@@ -102,15 +102,15 @@ GLINTInitVisualConfigs(ScreenPtr pScreen)
pGlintConfigs = (GLINTConfigPrivPtr)xnfcalloc( sizeof(GLINTConfigPrivRec),
numConfigs );
if ( !pGlintConfigs ) {
- xfree( pConfigs );
+ free(pConfigs);
return FALSE;
}
pGlintConfigPtrs = (GLINTConfigPrivPtr*)xnfcalloc( sizeof(GLINTConfigPrivPtr),
numConfigs );
if ( !pGlintConfigPtrs ) {
- xfree( pConfigs );
- xfree( pGlintConfigs );
+ free(pConfigs);
+ free(pGlintConfigs);
return FALSE;
}
@@ -198,15 +198,15 @@ GLINTInitVisualConfigs(ScreenPtr pScreen)
pGlintConfigs = (GLINTConfigPrivPtr)xnfcalloc( sizeof(GLINTConfigPrivRec),
numConfigs );
if ( !pGlintConfigs ) {
- xfree( pConfigs );
+ free(pConfigs);
return FALSE;
}
pGlintConfigPtrs = (GLINTConfigPrivPtr*)xnfcalloc( sizeof(GLINTConfigPrivPtr),
numConfigs );
if ( !pGlintConfigPtrs ) {
- xfree( pConfigs );
- xfree( pGlintConfigs );
+ free(pConfigs);
+ free(pGlintConfigs);
return FALSE;
}
@@ -490,7 +490,7 @@ GLINTDRIScreenInit(ScreenPtr pScreen)
pDRIInfo->busIdString = DRICreatePCIBusID(pGlint->PciInfo);
} else {
#ifndef XSERVER_LIBPCIACCESS
- pDRIInfo->busIdString = xalloc(64); /* Freed in DRIDestroyInfoRec */
+ pDRIInfo->busIdString = malloc(64); /* Freed in DRIDestroyInfoRec */
sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
((pciConfigPtr)pGlint->PciInfo->thisCard)->busnum,
((pciConfigPtr)pGlint->PciInfo->thisCard)->devnum,
@@ -528,7 +528,7 @@ GLINTDRIScreenInit(ScreenPtr pScreen)
pDRIInfo->SAREASize = SAREA_MAX;
#endif
- if (!(pGlintDRI = (GLINTDRIPtr)xcalloc(sizeof(GLINTDRIRec),1))) {
+ if (!(pGlintDRI = (GLINTDRIPtr)calloc(sizeof(GLINTDRIRec),1))) {
DRIDestroyInfoRec(pGlint->pDRIInfo);
return FALSE;
}
@@ -561,7 +561,7 @@ GLINTDRIScreenInit(ScreenPtr pScreen)
if (!DRIScreenInit(pScreen, pDRIInfo, &(pGlint->drmSubFD))) {
DRIDestroyInfoRec(pGlint->pDRIInfo);
- xfree(pGlintDRI);
+ free(pGlintDRI);
return FALSE;
}
@@ -818,13 +818,13 @@ GLINTDRICloseScreen(ScreenPtr pScreen)
if (pGlint->pDRIInfo) {
if (pGlint->pDRIInfo->devPrivate) {
- xfree(pGlint->pDRIInfo->devPrivate);
+ free(pGlint->pDRIInfo->devPrivate);
}
DRIDestroyInfoRec(pGlint->pDRIInfo);
}
- if (pGlint->pVisualConfigs) xfree(pGlint->pVisualConfigs);
- if (pGlint->pVisualConfigsPriv) xfree(pGlint->pVisualConfigsPriv);
+ if (pGlint->pVisualConfigs) free(pGlint->pVisualConfigs);
+ if (pGlint->pVisualConfigsPriv) free(pGlint->pVisualConfigsPriv);
}
Bool
diff --git a/src/glint_driver.c b/src/glint_driver.c
index ba51fee..4bd922a 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -442,7 +442,7 @@ GLINTFreeRec(ScrnInfoPtr pScrn)
TRACE_ENTER("GLINTFreeRec");
if (pScrn->driverPrivate == NULL)
return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
TRACE_EXIT("GLINTFreeRec");
}
@@ -556,7 +556,7 @@ GLINTProbe(DriverPtr drv, int flags)
}
}
- xfree(devSections);
+ free(devSections);
} else if (checkusedPci)
#endif
@@ -575,7 +575,7 @@ GLINTProbe(DriverPtr drv, int flags)
numDevSections, drv, &usedChips);
}
- xfree(devSections);
+ free(devSections);
if (numUsed <= 0)
return FALSE;
foundScreen = TRUE;
@@ -642,7 +642,7 @@ GLINTProbe(DriverPtr drv, int flags)
PCI_DEV_BUS(*checkusedPci),
PCI_DEV_DEV(*checkusedPci),
PCI_DEV_FUNC(*checkusedPci));
- xfree(usedChips);
+ free(usedChips);
return FALSE;
}
}
@@ -695,7 +695,7 @@ GLINTProbe(DriverPtr drv, int flags)
}
}
- xfree(usedChips);
+ free(usedChips);
TRACE_EXIT("GLINTProbe");
return foundScreen;
@@ -1030,7 +1030,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags)
xf86CollectOptions(pScrn, NULL);
/* Process the options */
- if (!(pGlint->Options = xalloc(sizeof(GLINTOptions))))
+ if (!(pGlint->Options = malloc(sizeof(GLINTOptions))))
return FALSE;
memcpy(pGlint->Options, GLINTOptions, sizeof(GLINTOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pGlint->Options);
@@ -2819,7 +2819,7 @@ GLINTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if(pGlint->ShadowFB) {
pGlint->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * pScrn->virtualX);
- pGlint->ShadowPtr = xalloc(pGlint->ShadowPitch * pScrn->virtualY);
+ pGlint->ShadowPtr = malloc(pGlint->ShadowPitch * pScrn->virtualY);
displayWidth = pGlint->ShadowPitch / (pScrn->bitsPerPixel >> 3);
FBStart = pGlint->ShadowPtr;
} else {
@@ -3376,11 +3376,11 @@ GLINTCloseScreen(int scrnIndex, ScreenPtr pScreen)
if(pGlint->CursorInfoRec)
xf86DestroyCursorInfoRec(pGlint->CursorInfoRec);
if (pGlint->ShadowPtr)
- xfree(pGlint->ShadowPtr);
+ free(pGlint->ShadowPtr);
if (pGlint->DGAModes)
- xfree(pGlint->DGAModes);
+ free(pGlint->DGAModes);
if (pGlint->ScratchBuffer)
- xfree(pGlint->ScratchBuffer);
+ free(pGlint->ScratchBuffer);
pScrn->vtSema = FALSE;
if (xf86IsPc98())
diff --git a/src/pm2_video.c b/src/pm2_video.c
index 46d5d74..c9f6c05 100644
--- a/src/pm2_video.c
+++ b/src/pm2_video.c
@@ -184,7 +184,7 @@ static AdaptorPrivPtr AdaptorPrivList = NULL;
#define FreeCookies(pPPriv) \
do { \
if ((pPPriv)->pCookies) { \
- xfree((pPPriv)->pCookies); \
+ free((pPPriv)->pCookies); \
(pPPriv)->pCookies = NULL; \
} \
} while (0)
@@ -795,7 +795,7 @@ RemakePutCookies(PortPrivPtr pPPriv, RegionPtr pRegion)
nBox = REGION_NUM_RECTS(pRegion);
if (!pPPriv->pCookies || pPPriv->nCookies < nBox) {
- if (!(pCookie = (CookiePtr) xrealloc(pPPriv->pCookies, nBox * sizeof(CookieRec))))
+ if (!(pCookie = (CookiePtr) realloc(pPPriv->pCookies, nBox * sizeof(CookieRec))))
return FALSE;
pPPriv->pCookies = pCookie;
@@ -1071,7 +1071,7 @@ RemakeGetCookies(PortPrivPtr pPPriv, RegionPtr pRegion)
nBox = REGION_NUM_RECTS(pRegion);
if (!pPPriv->pCookies || pPPriv->nCookies < nBox) {
- if (!(pCookie = (CookiePtr) xrealloc(pPPriv->pCookies, nBox * sizeof(CookieRec))))
+ if (!(pCookie = (CookiePtr) realloc(pPPriv->pCookies, nBox * sizeof(CookieRec))))
return FALSE;
pPPriv->pCookies = pCookie;
@@ -2429,7 +2429,7 @@ xvipcHandshake(PortPrivPtr pPPriv, int op, Bool block)
xvipc.a = -1;
- pLFBArea = xalloc(sizeof(LFBAreaRec));
+ pLFBArea = malloc(sizeof(LFBAreaRec));
if (pLFBArea) {
pLFBArea->pFBArea = pFBArea =
@@ -2442,7 +2442,7 @@ xvipcHandshake(PortPrivPtr pPPriv, int op, Bool block)
((pFBArea->box.y1 * pScrn->displayWidth) +
pFBArea->box.x1) << BPPSHIFT(pGlint);
} else
- xfree(pLFBArea);
+ free(pLFBArea);
}
/* Report results */
@@ -2450,7 +2450,7 @@ xvipcHandshake(PortPrivPtr pPPriv, int op, Bool block)
if (ioctl(xvipc_fd, VIDIOC_PM2_XVIPC, (void *) &xvipc) != 0)
if (pFBArea) {
xf86FreeOffscreenArea(pFBArea);
- xfree(pLFBArea);
+ free(pLFBArea);
pFBArea = NULL;
}
@@ -2484,7 +2484,7 @@ xvipcHandshake(PortPrivPtr pPPriv, int op, Bool block)
if (ioctl(xvipc_fd, VIDIOC_PM2_XVIPC, (void *) &xvipc) == 0 && pLFBArea) {
xf86FreeOffscreenArea(pLFBArea->pFBArea);
*ppLFBArea = pLFBArea->Next;
- xfree(pLFBArea);
+ free(pLFBArea);
}
goto event;
@@ -2658,14 +2658,14 @@ DeleteAdaptorPriv(AdaptorPrivPtr pAPriv)
}
}
- xfree(pAPriv);
+ free(pAPriv);
}
static AdaptorPrivPtr
NewAdaptorPriv(ScrnInfoPtr pScrn, Bool VideoIO)
{
GLINTPtr pGlint = GLINTPTR(pScrn);
- AdaptorPrivPtr pAPriv = (AdaptorPrivPtr) xcalloc(1, sizeof(AdaptorPrivRec));
+ AdaptorPrivPtr pAPriv = (AdaptorPrivPtr) calloc(1, sizeof(AdaptorPrivRec));
int i;
if (!pAPriv)
@@ -2754,7 +2754,7 @@ NewAdaptorPriv(ScrnInfoPtr pScrn, Bool VideoIO)
break;
default:
- xfree(pAPriv);
+ free(pAPriv);
return NULL;
}
diff --git a/src/pm3_accel.c b/src/pm3_accel.c
index ed64669..786a3e3 100644
--- a/src/pm3_accel.c
+++ b/src/pm3_accel.c
@@ -450,9 +450,7 @@ Permedia3AccelInit(ScreenPtr pScreen)
CPU_TRANSFER_PAD_DWORD;
infoPtr->NumScanlineColorExpandBuffers = 1;
- pGlint->ScratchBuffer = xalloc(((pScrn->virtualX+62)/32*4)
- + (pScrn->virtualX
- * pScrn->bitsPerPixel / 8));
+ pGlint->ScratchBuffer = malloc(((pScrn->virtualX + 62) / 32 * 4) + (pScrn->virtualX * pScrn->bitsPerPixel / 8));
infoPtr->ScanlineColorExpandBuffers =
pGlint->XAAScanlineColorExpandBuffers;
pGlint->XAAScanlineColorExpandBuffers[0] =
diff --git a/src/pm3_video.c b/src/pm3_video.c
index f0d34a9..59a9ea2 100644
--- a/src/pm3_video.c
+++ b/src/pm3_video.c
@@ -98,7 +98,7 @@ void Permedia3InitVideo(ScreenPtr pScreen)
adaptors = &newAdaptor;
} else {
newAdaptors = /* need to free this someplace */
- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr *));
if(newAdaptors) {
memcpy(newAdaptors, adaptors, num_adaptors *
sizeof(XF86VideoAdaptorPtr));
@@ -113,7 +113,7 @@ void Permedia3InitVideo(ScreenPtr pScreen)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
if(newAdaptors)
- xfree(newAdaptors);
+ free(newAdaptors);
}
/* client libraries expect an encoding */
@@ -288,7 +288,7 @@ Permedia3SetupImageVideo(ScreenPtr pScreen)
XF86VideoAdaptorPtr adapt;
GLINTPortPrivPtr pPriv;
- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
sizeof(GLINTPortPrivRec) +
sizeof(DevUnion))))
return NULL;
@@ -1030,12 +1030,12 @@ Permedia3AllocateSurface(
surface->width = w;
surface->height = h;
- if(!(surface->offsets = xalloc(sizeof(int)))) {
+ if(!(surface->offsets = malloc(sizeof(int)))) {
xf86FreeOffscreenArea(area);
return BadAlloc;
}
- if(!(pPriv = xalloc(sizeof(OffscreenPrivRec)))) {
- xfree(surface->offsets);
+ if(!(pPriv = malloc(sizeof(OffscreenPrivRec)))) {
+ free(surface->offsets);
xf86FreeOffscreenArea(area);
return BadAlloc;
}
@@ -1080,9 +1080,9 @@ Permedia3FreeSurface(
if(pPriv->isOn)
Permedia3StopSurface(surface);
Reply to: