Update to xf86-video-mga 1.6.3
This commit is contained in:
matthieu
parent
3aa6a16e86
commit
f4a059c018
@ -1,3 +1,125 @@
|
||||
commit f647727a2c1d4c2a9261c411cd3df71c3c9f0c06
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Thu Dec 5 12:09:27 2013 +1000
|
||||
|
||||
mga: bump release to 1.6.3
|
||||
|
||||
commit 55525bdfc00b0b746401f6ea6ed289048e9d06eb
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Thu Dec 5 11:51:39 2013 +1000
|
||||
|
||||
mga: fix XAA runtime
|
||||
|
||||
XAA->USE_XAA add USE_XAA.
|
||||
|
||||
Tested-by: Avengence on #xorg-devel
|
||||
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
||||
|
||||
commit 6aa94687233f55a8044efe83cac82b04ab19609f
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sun Nov 17 10:27:42 2013 -0800
|
||||
|
||||
Remove mga_esc.c vestigal stub
|
||||
|
||||
Previously contained MGA HAL code, was left an empty shell by the
|
||||
removal of USEMGAHAL in commit 94bbeb132c7eda.
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
|
||||
|
||||
commit e9109a0b04695d6971c94abe271dda2dc1a5e886
|
||||
Author: Tormod Volden <debian.tormod@gmail.com>
|
||||
Date: Thu Oct 31 22:48:18 2013 +0100
|
||||
|
||||
mga: Use exaGetPixmapFirstPixel() instead of devPrivate.ptr
|
||||
|
||||
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
|
||||
|
||||
commit a77b9c5143591672fbe56f4428ced439c1f4d0f3
|
||||
Author: Egbert Eich <eich@freedesktop.org>
|
||||
Date: Mon Jul 29 13:02:21 2013 +0200
|
||||
|
||||
Disable HW cursor by default on G200 server chips
|
||||
|
||||
Disable HW cursor by default on G200 server chips as these chips a
|
||||
re often used with a remote graphics link which cannot display
|
||||
the HW cursor.
|
||||
This can be overridden by a config option.
|
||||
Most desktops today use ARGB cursors anyhow which are not
|
||||
supported by this driver anyhow. Thus the performance penalty
|
||||
should be irrelevant.
|
||||
|
||||
Signed-off-by: Egbert Eich <eich@freedesktop.org>
|
||||
|
||||
commit dba8778b9214dc3794198029fc6d59b3e97700d4
|
||||
Author: Egbert Eich <eich@freedesktop.org>
|
||||
Date: Mon Jul 29 13:01:45 2013 +0200
|
||||
|
||||
Restructure code to make it more readable
|
||||
|
||||
With the previous structure it wasn't immediately clear when SecondCrtc
|
||||
and HWCursor were set to which value. Make the code more readable.
|
||||
|
||||
Signed-off-by: Egbert Eich <eich@freedesktop.org>
|
||||
|
||||
commit cbcee5de1ba02c8a58bae932a0cb98093dccefd9
|
||||
Author: Tormod Volden <debian.tormod@gmail.com>
|
||||
Date: Thu Oct 17 22:01:20 2013 +0200
|
||||
|
||||
Fix dual head crash without XAA
|
||||
|
||||
https://launchpad.net/bugs/1180986
|
||||
|
||||
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
|
||||
Reviewed-by: Robert Jacobs <robert.n.jacobs@gmail.com>
|
||||
Tested-by: Robert Jacobs <robert.n.jacobs@gmail.com>
|
||||
|
||||
commit 15815c8612694a89d0d8593b3e603fdcdeacdd05
|
||||
Author: Andy MacLean <andy-ub1@themacleans.org.uk>
|
||||
Date: Thu Oct 17 19:51:36 2013 +0200
|
||||
|
||||
Unbreak dual head (xinerama)
|
||||
|
||||
This patch has been used in Debian, Ubuntu and Gentoo for years.
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=18472
|
||||
https://launchpad.net/bugs/292214
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=265100
|
||||
|
||||
Signed-off-by: Andy MacLean <andy-ub1@themacleans.org.uk>
|
||||
Reviewed-by: Cyril Brulebois <kibi@debian.org>
|
||||
Reviewed-by: Robert Jacobs <robert.n.jacobs@gmail.com>
|
||||
Tested-by: Robert Jacobs <robert.n.jacobs@gmail.com>
|
||||
|
||||
commit 12af175fee1d3f6f17f8391ec642d904deca3783
|
||||
Author: Egbert Eich <eich@freedesktop.org>
|
||||
Date: Tue Jun 7 19:31:16 2011 +0200
|
||||
|
||||
Disable Linear Expansion on BE
|
||||
|
||||
Linear Expansion doesn't work on BE as the bit order in
|
||||
a word is reversed. ScreenToScreenColorExpansion allows
|
||||
to adjust the bit order in a byte, still the bytes have
|
||||
the wrong order.
|
||||
|
||||
Reviewed-by: <wharms@bfs.de>
|
||||
Signed-off-by: Egbert Eich <eich@freedesktop.org>
|
||||
|
||||
commit 49381ff2c3aa98be5bb84494b2ad3f81a0d31bcc
|
||||
Author: Julien Cristau <jcristau@debian.org>
|
||||
Date: Mon Jan 7 23:04:36 2013 +0100
|
||||
|
||||
Restrict kernel driver matching to g200 server chips
|
||||
|
||||
Otherwise we might catch devices handled by matroxfb, not the mgag200
|
||||
kms driver.
|
||||
|
||||
Debian bug#697532
|
||||
|
||||
Reported-by: olafBuddenhagen@gmx.net
|
||||
Reviewed-by: Dave Airlie <airlied@redhat.com>
|
||||
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
||||
|
||||
commit fcd27b2b4ab2a181d5263296e71cda2d8772ba2d
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Fri Sep 28 11:36:44 2012 +1000
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Makefile.in generated by automake 1.12.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.12.6 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
|
||||
@ -241,6 +241,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
|
||||
PCIACCESS_LIBS = @PCIACCESS_LIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
|
||||
173
driver/xf86-video-mga/aclocal.m4
vendored
173
driver/xf86-video-mga/aclocal.m4
vendored
@ -1,4 +1,4 @@
|
||||
# generated automatically by aclocal 1.12.3 -*- Autoconf -*-
|
||||
# generated automatically by aclocal 1.12.6 -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
|
||||
|
||||
@ -8607,6 +8607,7 @@ m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
|
||||
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
|
||||
|
||||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
# serial 1 (pkg-config-0.24)
|
||||
#
|
||||
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
#
|
||||
@ -8633,8 +8634,12 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
|
||||
# ----------------------------------
|
||||
AC_DEFUN([PKG_PROG_PKG_CONFIG],
|
||||
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
||||
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
|
||||
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
|
||||
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
|
||||
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
|
||||
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
|
||||
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
|
||||
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
|
||||
|
||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
||||
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
||||
fi
|
||||
@ -8647,7 +8652,6 @@ if test -n "$PKG_CONFIG"; then
|
||||
AC_MSG_RESULT([no])
|
||||
PKG_CONFIG=""
|
||||
fi
|
||||
|
||||
fi[]dnl
|
||||
])# PKG_PROG_PKG_CONFIG
|
||||
|
||||
@ -8656,33 +8660,31 @@ fi[]dnl
|
||||
# Check to see whether a particular set of modules exists. Similar
|
||||
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
|
||||
#
|
||||
#
|
||||
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
|
||||
# this or PKG_CHECK_MODULES is called, or make sure to call
|
||||
# PKG_CHECK_EXISTS manually
|
||||
# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
# only at the first occurence in configure.ac, so if the first place
|
||||
# it's called might be skipped (such as if it is within an "if", you
|
||||
# have to call PKG_CHECK_EXISTS manually
|
||||
# --------------------------------------------------------------
|
||||
AC_DEFUN([PKG_CHECK_EXISTS],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
|
||||
m4_ifval([$2], [$2], [:])
|
||||
m4_default([$2], [:])
|
||||
m4_ifvaln([$3], [else
|
||||
$3])dnl
|
||||
fi])
|
||||
|
||||
|
||||
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
||||
# ---------------------------------------------
|
||||
m4_define([_PKG_CONFIG],
|
||||
[if test -n "$PKG_CONFIG"; then
|
||||
if test -n "$$1"; then
|
||||
[if test -n "$$1"; then
|
||||
pkg_cv_[]$1="$$1"
|
||||
else
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
PKG_CHECK_EXISTS([$3],
|
||||
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
|
||||
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes ],
|
||||
[pkg_failed=yes])
|
||||
fi
|
||||
else
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi[]dnl
|
||||
])# _PKG_CONFIG
|
||||
@ -8725,16 +8727,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.])
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
AC_MSG_RESULT([no])
|
||||
_PKG_SHORT_ERRORS_SUPPORTED
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
||||
|
||||
ifelse([$4], , [AC_MSG_ERROR(dnl
|
||||
m4_default([$4], [AC_MSG_ERROR(
|
||||
[Package requirements ($2) were not met:
|
||||
|
||||
$$1_PKG_ERRORS
|
||||
@ -8742,28 +8745,67 @@ $$1_PKG_ERRORS
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
_PKG_TEXT
|
||||
])],
|
||||
[AC_MSG_RESULT([no])
|
||||
$4])
|
||||
_PKG_TEXT])[]dnl
|
||||
])
|
||||
elif test $pkg_failed = untried; then
|
||||
ifelse([$4], , [AC_MSG_FAILURE(dnl
|
||||
AC_MSG_RESULT([no])
|
||||
m4_default([$4], [AC_MSG_FAILURE(
|
||||
[The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
_PKG_TEXT
|
||||
|
||||
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
|
||||
[$4])
|
||||
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
|
||||
])
|
||||
else
|
||||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
||||
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
|
||||
AC_MSG_RESULT([yes])
|
||||
ifelse([$3], , :, [$3])
|
||||
$3
|
||||
fi[]dnl
|
||||
])# PKG_CHECK_MODULES
|
||||
|
||||
|
||||
# PKG_INSTALLDIR(DIRECTORY)
|
||||
# -------------------------
|
||||
# Substitutes the variable pkgconfigdir as the location where a module
|
||||
# should install pkg-config .pc files. By default the directory is
|
||||
# $libdir/pkgconfig, but the default can be changed by passing
|
||||
# DIRECTORY. The user can override through the --with-pkgconfigdir
|
||||
# parameter.
|
||||
AC_DEFUN([PKG_INSTALLDIR],
|
||||
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
|
||||
m4_pushdef([pkg_description],
|
||||
[pkg-config installation directory @<:@]pkg_default[@:>@])
|
||||
AC_ARG_WITH([pkgconfigdir],
|
||||
[AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
|
||||
[with_pkgconfigdir=]pkg_default)
|
||||
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
|
||||
m4_popdef([pkg_default])
|
||||
m4_popdef([pkg_description])
|
||||
]) dnl PKG_INSTALLDIR
|
||||
|
||||
|
||||
# PKG_NOARCH_INSTALLDIR(DIRECTORY)
|
||||
# -------------------------
|
||||
# Substitutes the variable noarch_pkgconfigdir as the location where a
|
||||
# module should install arch-independent pkg-config .pc files. By
|
||||
# default the directory is $datadir/pkgconfig, but the default can be
|
||||
# changed by passing DIRECTORY. The user can override through the
|
||||
# --with-noarch-pkgconfigdir parameter.
|
||||
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
|
||||
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
|
||||
m4_pushdef([pkg_description],
|
||||
[pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
|
||||
AC_ARG_WITH([noarch-pkgconfigdir],
|
||||
[AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
|
||||
[with_noarch_pkgconfigdir=]pkg_default)
|
||||
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
|
||||
m4_popdef([pkg_default])
|
||||
m4_popdef([pkg_description])
|
||||
]) dnl PKG_NOARCH_INSTALLDIR
|
||||
|
||||
# Copyright (C) 2002-2012 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is free software; the Free Software Foundation
|
||||
@ -8779,7 +8821,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
|
||||
[am__api_version='1.12'
|
||||
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
|
||||
dnl require some minimum version. Point them to the right macro.
|
||||
m4_if([$1], [1.12.3], [],
|
||||
m4_if([$1], [1.12.6], [],
|
||||
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
|
||||
])
|
||||
|
||||
@ -8795,7 +8837,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
|
||||
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
|
||||
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
|
||||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
||||
[AM_AUTOMAKE_VERSION([1.12.3])dnl
|
||||
[AM_AUTOMAKE_VERSION([1.12.6])dnl
|
||||
m4_ifndef([AC_AUTOCONF_VERSION],
|
||||
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
|
||||
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
|
||||
@ -9824,7 +9866,7 @@ dnl DEALINGS IN THE SOFTWARE.
|
||||
# See the "minimum version" comment for each macro you use to see what
|
||||
# version you require.
|
||||
m4_defun([XORG_MACROS_VERSION],[
|
||||
m4_define([vers_have], [1.16.2])
|
||||
m4_define([vers_have], [1.19.0])
|
||||
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
||||
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
||||
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
||||
@ -9874,6 +9916,7 @@ if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
||||
AC_MSG_RESULT([no])
|
||||
else
|
||||
if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
||||
TRADITIONALCPPFLAGS="-traditional"
|
||||
RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
@ -9882,6 +9925,7 @@ else
|
||||
fi
|
||||
rm -f conftest.$ac_ext
|
||||
AC_SUBST(RAWCPPFLAGS)
|
||||
AC_SUBST(TRADITIONALCPPFLAGS)
|
||||
]) # XORG_PROG_RAWCPP
|
||||
|
||||
# XORG_MANPAGE_SECTIONS()
|
||||
@ -10406,9 +10450,10 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
|
||||
]) # XORG_WITH_ASCIIDOC
|
||||
|
||||
# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
|
||||
# --------------------------------
|
||||
# -------------------------------------------
|
||||
# Minimum version: 1.5.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
# Minimum version for optional DOT checking: 1.18.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
@ -10428,6 +10473,7 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_DOXYGEN],[
|
||||
AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
|
||||
AC_ARG_VAR([DOT], [Path to the dot graphics utility])
|
||||
m4_define([_defopt], m4_default([$2], [auto]))
|
||||
AC_ARG_WITH(doxygen,
|
||||
AS_HELP_STRING([--with-doxygen],
|
||||
@ -10471,6 +10517,20 @@ m4_ifval([$1],
|
||||
AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed])
|
||||
fi])
|
||||
fi])
|
||||
|
||||
dnl Check for DOT if we have doxygen. The caller decides if it is mandatory
|
||||
dnl HAVE_DOT is a variable that can be used in your doxygen.in config file:
|
||||
dnl HAVE_DOT = @HAVE_DOT@
|
||||
HAVE_DOT=no
|
||||
if test "x$have_doxygen" = "xyes"; then
|
||||
AC_PATH_PROG([DOT], [dot])
|
||||
if test "x$DOT" != "x"; then
|
||||
HAVE_DOT=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST([HAVE_DOT])
|
||||
AM_CONDITIONAL([HAVE_DOT], [test "$HAVE_DOT" = "yes"])
|
||||
AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
|
||||
]) # XORG_WITH_DOXYGEN
|
||||
|
||||
@ -10653,6 +10713,29 @@ fi])
|
||||
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
|
||||
]) # XORG_WITH_FOP
|
||||
|
||||
# XORG_WITH_M4([MIN-VERSION])
|
||||
# ---------------------------
|
||||
# Minimum version: 1.19.0
|
||||
#
|
||||
# This macro attempts to locate an m4 macro processor which supports
|
||||
# -I option and is only useful for modules relying on M4 in order to
|
||||
# expand macros in source code files.
|
||||
#
|
||||
# Interface to module:
|
||||
# M4: returns the path of the m4 program found
|
||||
# returns the path set by the user in the environment
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_M4], [
|
||||
AC_CACHE_CHECK([for m4 that supports -I option], [ac_cv_path_M4],
|
||||
[AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4],
|
||||
[[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \
|
||||
ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]],
|
||||
[AC_MSG_ERROR([could not find m4 that supports -I option])],
|
||||
[$PATH:/usr/gnu/bin])])
|
||||
|
||||
AC_SUBST([M4], [$ac_cv_path_M4])
|
||||
]) # XORG_WITH_M4
|
||||
|
||||
# XORG_WITH_PS2PDF([DEFAULT])
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
@ -11107,7 +11190,8 @@ AC_ARG_ENABLE(malloc0returnsnull,
|
||||
|
||||
AC_MSG_CHECKING([whether malloc(0) returns NULL])
|
||||
if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
|
||||
AC_RUN_IFELSE([AC_LANG_PROGRAM([
|
||||
AC_CACHE_VAL([xorg_cv_malloc0_returns_null],
|
||||
[AC_RUN_IFELSE([AC_LANG_PROGRAM([
|
||||
#include <stdlib.h>
|
||||
],[
|
||||
char *m0, *r0, *c0, *p;
|
||||
@ -11117,9 +11201,9 @@ if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
|
||||
c0 = calloc(0,10);
|
||||
exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1);
|
||||
])],
|
||||
[MALLOC_ZERO_RETURNS_NULL=yes],
|
||||
[MALLOC_ZERO_RETURNS_NULL=no],
|
||||
[MALLOC_ZERO_RETURNS_NULL=yes])
|
||||
[xorg_cv_malloc0_returns_null=yes],
|
||||
[xorg_cv_malloc0_returns_null=no])])
|
||||
MALLOC_ZERO_RETURNS_NULL=$xorg_cv_malloc0_returns_null
|
||||
fi
|
||||
AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
|
||||
|
||||
@ -11330,18 +11414,18 @@ fi
|
||||
found="no"
|
||||
m4_foreach([flag], m4_cdr($@), [
|
||||
if test $found = "no" ; then
|
||||
if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
|
||||
if test "x$xorg_testset_]CACHE_PREFIX[_unknown_warning_option" = "xyes" ; then
|
||||
PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
|
||||
fi
|
||||
|
||||
if test "x$xorg_testset_unused_command_line_argument" = "xyes" ; then
|
||||
if test "x$xorg_testset_]CACHE_PREFIX[_unused_command_line_argument" = "xyes" ; then
|
||||
PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument"
|
||||
fi
|
||||
|
||||
PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag["
|
||||
|
||||
dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname
|
||||
AC_MSG_CHECKING([if ]COMPILER[ supports]flag[])
|
||||
AC_MSG_CHECKING([if ]COMPILER[ supports ]flag[])
|
||||
cacheid=AS_TR_SH([xorg_cv_]CACHE_PREFIX[_flag_]flag[])
|
||||
AC_CACHE_VAL($cacheid,
|
||||
[AC_LINK_IFELSE([AC_LANG_PROGRAM([int i;])],
|
||||
@ -11408,7 +11492,7 @@ AC_LANG_CASE(
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-prototypes])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition], [-fd])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wdeclaration-after-statement])
|
||||
]
|
||||
)
|
||||
@ -11417,16 +11501,17 @@ AC_LANG_CASE(
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wunused])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
|
||||
|
||||
# These are currently disabled because they are noisy. They will be enabled
|
||||
# in the future once the codebase is sufficiently modernized to silence
|
||||
# them. For now, I don't want them to drown out the other warnings.
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
|
||||
|
||||
# Turn some warnings into errors, so we don't accidently get successful builds
|
||||
# when there are problems that should be fixed.
|
||||
@ -11662,10 +11747,10 @@ dnl other dealings in this Software without prior written authorization
|
||||
dnl from the copyright holders.
|
||||
dnl
|
||||
|
||||
# XORG_DRIVER_CHECK_EXT()
|
||||
# XORG_DRIVER_CHECK_EXT(MACRO, PROTO)
|
||||
# --------------------------
|
||||
# Checks for the $1 define in xorg-server.h (from the sdk). If it
|
||||
# is defined, then add $1 to $REQUIRED_MODULES.
|
||||
# Checks for the MACRO define in xorg-server.h (from the sdk). If it
|
||||
# is defined, then add the given PROTO to $REQUIRED_MODULES.
|
||||
|
||||
AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
|
||||
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
|
||||
13
driver/xf86-video-mga/config.guess
vendored
13
driver/xf86-video-mga/config.guess
vendored
@ -4,7 +4,7 @@
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
||||
# 2011, 2012 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2012-06-17'
|
||||
timestamp='2012-09-25'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
@ -306,7 +306,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
|
||||
echo arm-acorn-riscix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
arm:riscos:*:*|arm:RISCOS:*:*)
|
||||
arm*:riscos:*:*|arm*:RISCOS:*:*)
|
||||
echo arm-unknown-riscos
|
||||
exit ;;
|
||||
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
|
||||
@ -805,6 +805,9 @@ EOF
|
||||
i*:CYGWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-cygwin
|
||||
exit ;;
|
||||
*:MINGW64*:*)
|
||||
echo ${UNAME_MACHINE}-pc-mingw64
|
||||
exit ;;
|
||||
*:MINGW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-mingw32
|
||||
exit ;;
|
||||
@ -1205,6 +1208,9 @@ EOF
|
||||
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
|
||||
echo i586-pc-haiku
|
||||
exit ;;
|
||||
x86_64:Haiku:*:*)
|
||||
echo x86_64-unknown-haiku
|
||||
exit ;;
|
||||
SX-4:SUPER-UX:*:*)
|
||||
echo sx4-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
@ -1334,9 +1340,6 @@ EOF
|
||||
exit ;;
|
||||
esac
|
||||
|
||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
|
||||
|
||||
eval $set_cc_for_build
|
||||
cat >$dummy.c <<EOF
|
||||
#ifdef _SEQUENT_
|
||||
|
||||
@ -84,7 +84,7 @@
|
||||
/* Build support for Exa */
|
||||
#undef USE_EXA
|
||||
|
||||
/* Build support for xaa */
|
||||
/* Build support for XAA */
|
||||
#undef USE_XAA
|
||||
|
||||
/* Version number of package */
|
||||
|
||||
31
driver/xf86-video-mga/config.sub
vendored
31
driver/xf86-video-mga/config.sub
vendored
@ -4,7 +4,7 @@
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
||||
# 2011, 2012 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2012-06-17'
|
||||
timestamp='2012-12-06'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
@ -123,7 +123,7 @@ esac
|
||||
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||
case $maybe_os in
|
||||
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
|
||||
linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
||||
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
||||
knetbsd*-gnu* | netbsd*-gnu* | \
|
||||
kopensolaris*-gnu* | \
|
||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
@ -156,7 +156,7 @@ case $os in
|
||||
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
||||
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
||||
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
||||
-apple | -axis | -knuth | -cray | -microblaze)
|
||||
-apple | -axis | -knuth | -cray | -microblaze*)
|
||||
os=
|
||||
basic_machine=$1
|
||||
;;
|
||||
@ -259,7 +259,9 @@ case $basic_machine in
|
||||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
||||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
||||
| am33_2.0 \
|
||||
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
||||
| arc \
|
||||
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
|
||||
| avr | avr32 \
|
||||
| be32 | be64 \
|
||||
| bfin \
|
||||
| c4x | clipper \
|
||||
@ -273,7 +275,7 @@ case $basic_machine in
|
||||
| le32 | le64 \
|
||||
| lm32 \
|
||||
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
||||
| maxq | mb | microblaze | mcore | mep | metag \
|
||||
| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
|
||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||
| mips16 \
|
||||
| mips64 | mips64el \
|
||||
@ -389,7 +391,8 @@ case $basic_machine in
|
||||
| lm32-* \
|
||||
| m32c-* | m32r-* | m32rle-* \
|
||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
|
||||
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
|
||||
| microblaze-* | microblazeel-* \
|
||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
||||
| mips16-* \
|
||||
| mips64-* | mips64el-* \
|
||||
@ -788,9 +791,13 @@ case $basic_machine in
|
||||
basic_machine=ns32k-utek
|
||||
os=-sysv
|
||||
;;
|
||||
microblaze)
|
||||
microblaze*)
|
||||
basic_machine=microblaze-xilinx
|
||||
;;
|
||||
mingw64)
|
||||
basic_machine=x86_64-pc
|
||||
os=-mingw64
|
||||
;;
|
||||
mingw32)
|
||||
basic_machine=i386-pc
|
||||
os=-mingw32
|
||||
@ -1019,7 +1026,11 @@ case $basic_machine in
|
||||
basic_machine=i586-unknown
|
||||
os=-pw32
|
||||
;;
|
||||
rdos)
|
||||
rdos | rdos64)
|
||||
basic_machine=x86_64-pc
|
||||
os=-rdos
|
||||
;;
|
||||
rdos32)
|
||||
basic_machine=i386-pc
|
||||
os=-rdos
|
||||
;;
|
||||
@ -1359,8 +1370,8 @@ case $os in
|
||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
| -chorusos* | -chorusrdb* | -cegcc* \
|
||||
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -linux-gnu* | -linux-android* \
|
||||
| -linux-newlib* | -linux-uclibc* \
|
||||
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
|
||||
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
|
||||
| -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
||||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
||||
|
||||
816
driver/xf86-video-mga/configure
vendored
816
driver/xf86-video-mga/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -23,7 +23,7 @@
|
||||
# Initialize Autoconf
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([xf86-video-mga],
|
||||
[1.6.2],
|
||||
[1.6.3],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
[xf86-video-mga])
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
@ -147,6 +147,9 @@ fi
|
||||
AC_MSG_CHECKING([whether to include XAA support])
|
||||
AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
|
||||
AC_MSG_RESULT([$XAA])
|
||||
if test "x$XAA" = xyes; then
|
||||
AC_DEFINE(USE_XAA, 1, [Build support for XAA])
|
||||
fi
|
||||
|
||||
# Properly handle EXA.
|
||||
AC_MSG_CHECKING([whether to enable EXA support])
|
||||
|
||||
@ -74,6 +74,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
|
||||
|
||||
rm -f "$tmpdepfile"
|
||||
|
||||
# Avoid interferences from the environment.
|
||||
gccflag= dashmflag=
|
||||
|
||||
# Some modes work just like other modes, but use different flags. We
|
||||
# parameterize here, but still list the modes in the big case below,
|
||||
# to make depend.m4 easier to write. Note that we *cannot* use a case
|
||||
@ -108,7 +111,7 @@ if test "$depmode" = msvc7msys; then
|
||||
fi
|
||||
|
||||
if test "$depmode" = xlc; then
|
||||
# IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
|
||||
# IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
|
||||
gccflag=-qmakedep=gcc,-MF
|
||||
depmode=gcc
|
||||
fi
|
||||
@ -142,13 +145,17 @@ gcc3)
|
||||
;;
|
||||
|
||||
gcc)
|
||||
## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
|
||||
## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
|
||||
## (see the conditional assignment to $gccflag above).
|
||||
## There are various ways to get dependency output from gcc. Here's
|
||||
## why we pick this rather obscure method:
|
||||
## - Don't want to use -MD because we'd like the dependencies to end
|
||||
## up in a subdir. Having to rename by hand is ugly.
|
||||
## (We might end up doing this anyway to support other compilers.)
|
||||
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
|
||||
## -MM, not -M (despite what the docs say).
|
||||
## -MM, not -M (despite what the docs say). Also, it might not be
|
||||
## supported by the other compilers which use the 'gcc' depmode.
|
||||
## - Using -M directly means running the compiler twice (even worse
|
||||
## than renaming).
|
||||
if test -z "$gccflag"; then
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Makefile.in generated by automake 1.12.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.12.6 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
|
||||
@ -212,6 +212,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
|
||||
PCIACCESS_LIBS = @PCIACCESS_LIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
|
||||
@ -39,7 +39,6 @@ mga_drv_la_SOURCES = \
|
||||
mga_dga.c \
|
||||
mga_dh.c \
|
||||
mga_driver.c \
|
||||
mga_esc.c \
|
||||
mga_g450pll.c \
|
||||
mga.h \
|
||||
mga_halmod.c \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Makefile.in generated by automake 1.12.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.12.6 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
|
||||
@ -124,8 +124,8 @@ LTLIBRARIES = $(mga_drv_la_LTLIBRARIES)
|
||||
mga_drv_la_DEPENDENCIES =
|
||||
am__mga_drv_la_SOURCES_DIST = binding.h client.h mga_bios.c \
|
||||
mga_common.h mga_dac3026.c mga_dacG.c mga_dga.c mga_dh.c \
|
||||
mga_driver.c mga_esc.c mga_g450pll.c mga.h mga_halmod.c \
|
||||
mga_hwcurs.c mga_macros.h mga_maven.h mga_merge.c mga_merge.h \
|
||||
mga_driver.c mga_g450pll.c mga.h mga_halmod.c mga_hwcurs.c \
|
||||
mga_macros.h mga_maven.h mga_merge.c mga_merge.h \
|
||||
mgareg_flags.h mga_reg.h mga_sarea.h mga_shadow.c mga_ucode.h \
|
||||
mga_vga.c mga_video.c mga_storm.c compat-api.h mga_dri.c \
|
||||
mga_dri.h mga_dripriv.h mga_exa.c mga_arc.c
|
||||
@ -133,7 +133,7 @@ am__mga_drv_la_SOURCES_DIST = binding.h client.h mga_bios.c \
|
||||
@USE_EXA_TRUE@am__objects_2 = mga_exa.lo
|
||||
@XAA_TRUE@am__objects_3 = mga_arc.lo
|
||||
am_mga_drv_la_OBJECTS = mga_bios.lo mga_dac3026.lo mga_dacG.lo \
|
||||
mga_dga.lo mga_dh.lo mga_driver.lo mga_esc.lo mga_g450pll.lo \
|
||||
mga_dga.lo mga_dh.lo mga_driver.lo mga_g450pll.lo \
|
||||
mga_halmod.lo mga_hwcurs.lo mga_merge.lo mga_shadow.lo \
|
||||
mga_vga.lo mga_video.lo mga_storm.lo $(am__objects_1) \
|
||||
$(am__objects_2) $(am__objects_3)
|
||||
@ -269,6 +269,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
|
||||
PCIACCESS_LIBS = @PCIACCESS_LIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
@ -345,11 +347,11 @@ mga_drv_ladir = @moduledir@/drivers
|
||||
mga_drv_la_LIBADD = $(noinst_LTLIBRARIES)
|
||||
mga_drv_la_SOURCES = binding.h client.h mga_bios.c mga_common.h \
|
||||
mga_dac3026.c mga_dacG.c mga_dga.c mga_dh.c mga_driver.c \
|
||||
mga_esc.c mga_g450pll.c mga.h mga_halmod.c mga_hwcurs.c \
|
||||
mga_macros.h mga_maven.h mga_merge.c mga_merge.h \
|
||||
mgareg_flags.h mga_reg.h mga_sarea.h mga_shadow.c mga_ucode.h \
|
||||
mga_vga.c mga_video.c mga_storm.c compat-api.h $(am__append_1) \
|
||||
$(am__append_2) $(am__append_3)
|
||||
mga_g450pll.c mga.h mga_halmod.c mga_hwcurs.c mga_macros.h \
|
||||
mga_maven.h mga_merge.c mga_merge.h mgareg_flags.h mga_reg.h \
|
||||
mga_sarea.h mga_shadow.c mga_ucode.h mga_vga.c mga_video.c \
|
||||
mga_storm.c compat-api.h $(am__append_1) $(am__append_2) \
|
||||
$(am__append_3)
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@ -435,7 +437,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mga_dh.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mga_dri.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mga_driver.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mga_esc.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mga_exa.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mga_g450pll.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mga_halmod.Plo@am__quote@
|
||||
|
||||
@ -343,6 +343,13 @@ typedef struct {
|
||||
int mastervideoRam;
|
||||
int slavevideoRam;
|
||||
Bool directRenderingEnabled;
|
||||
|
||||
void * mappedIOBase;
|
||||
int mappedIOUsage;
|
||||
|
||||
void * mappedILOADBase;
|
||||
int mappedILOADUsage;
|
||||
|
||||
ScrnInfoPtr pScrn_1;
|
||||
ScrnInfoPtr pScrn_2;
|
||||
} MGAEntRec, *MGAEntPtr;
|
||||
@ -688,7 +695,12 @@ extern CARD32 MGAAtypeNoBLK[16];
|
||||
#define NICE_DASH_PATTERN 0x00000020
|
||||
#define TWO_PASS_COLOR_EXPAND 0x00000040
|
||||
#define MGA_NO_PLANEMASK 0x00000080
|
||||
/* linear expansion doesn't work on BE due to wrong byte order */
|
||||
#if X_BYTE_ORDER == X_BIG_ENDIAN
|
||||
#define USE_LINEAR_EXPANSION 0x00000000
|
||||
#else
|
||||
#define USE_LINEAR_EXPANSION 0x00000100
|
||||
#endif
|
||||
#define LARGE_ADDRESSES 0x00000200
|
||||
|
||||
#define MGAIOMAPSIZE 0x00004000
|
||||
|
||||
@ -676,6 +676,15 @@ MGAPciProbe(DriverPtr drv, int entity_num, struct pci_device * dev,
|
||||
#endif
|
||||
|
||||
if (pci_device_has_kernel_driver(dev)) {
|
||||
/* If it's a G200 server chip, it's probably on KMS, so bail; if not,
|
||||
* it might be using matroxfb, which is ok. */
|
||||
switch (dev->device_id) {
|
||||
case PCI_CHIP_MGAG200_SE_A_PCI:
|
||||
case PCI_CHIP_MGAG200_SE_B_PCI:
|
||||
case PCI_CHIP_MGAG200_EV_PCI:
|
||||
case PCI_CHIP_MGAG200_ER_PCI:
|
||||
case PCI_CHIP_MGAG200_WINBOND_PCI:
|
||||
case PCI_CHIP_MGAG200_EH_PCI:
|
||||
xf86DrvMsg(0, X_ERROR,
|
||||
"mga: The PCI device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n",
|
||||
dev->device_id, dev->bus, dev->domain, dev->dev, dev->func);
|
||||
@ -683,6 +692,7 @@ MGAPciProbe(DriverPtr drv, int entity_num, struct pci_device * dev,
|
||||
"mga: This driver cannot operate until it has been unloaded.\n");
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
/* Allocate a ScrnInfoRec and claim the slot */
|
||||
pScrn = xf86ConfigPciEntity(pScrn, 0, entity_num, MGAPciChipsets,
|
||||
@ -1669,6 +1679,43 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Disable HW cursor by default on G200 server chips as these
|
||||
* chips are often used with a remote graphics link which cannot
|
||||
* display the HW cursor.
|
||||
*/
|
||||
switch (pMga->Chipset) {
|
||||
case PCI_CHIP_MGAG200_SE_A_PCI:
|
||||
case PCI_CHIP_MGAG200_SE_B_PCI:
|
||||
case PCI_CHIP_MGAG200_EV_PCI:
|
||||
case PCI_CHIP_MGAG200_ER_PCI:
|
||||
case PCI_CHIP_MGAG200_WINBOND_PCI:
|
||||
case PCI_CHIP_MGAG200_EH_PCI:
|
||||
pMga->HWCursor = FALSE;
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
||||
"HW cursor is not supported with video redirection on"
|
||||
"G200 server chips.\n If you don't intend to use video "
|
||||
"redirection enable with Option \"HWCursor\" \"On\"\n");
|
||||
break;
|
||||
default:
|
||||
pMga->HWCursor = TRUE;
|
||||
}
|
||||
from = X_DEFAULT;
|
||||
|
||||
/*
|
||||
* The preferred method is to use the "hw cursor" option as a tri-state
|
||||
* option, with the default set above.
|
||||
*/
|
||||
if (xf86GetOptValBool(pMga->Options, OPTION_HW_CURSOR, &pMga->HWCursor))
|
||||
from = X_CONFIG;
|
||||
|
||||
/* For compatibility, accept this too (as an override) */
|
||||
if (xf86ReturnOptValBool(pMga->Options, OPTION_SW_CURSOR, FALSE)) {
|
||||
from = X_CONFIG;
|
||||
pMga->HWCursor = FALSE;
|
||||
}
|
||||
|
||||
pMga->SecondCrtc = FALSE;
|
||||
/*
|
||||
* In case of DualHead, we need to determine if we are the 'master' head
|
||||
* or the 'slave' head. In order to do that, at the end of the first
|
||||
@ -1681,13 +1728,12 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
if (xf86IsEntityShared(pScrn->entityList[0])) { /* dual-head mode */
|
||||
if (!xf86IsPrimInitDone(pScrn->entityList[0])) { /* Is it the first initialisation? */
|
||||
/* First CRTC */
|
||||
pMga->SecondCrtc = FALSE;
|
||||
pMga->HWCursor = TRUE;
|
||||
pMgaEnt->pScrn_1 = pScrn;
|
||||
} else if (pMga->DualHeadEnabled) {
|
||||
/* Second CRTC */
|
||||
pMga->SecondCrtc = TRUE;
|
||||
pMga->HWCursor = FALSE;
|
||||
from = X_DEFAULT;
|
||||
pMgaEnt->pScrn_2 = pScrn;
|
||||
pScrn->AdjustFrame = MGAAdjustFrameCrtc2;
|
||||
/*
|
||||
@ -1706,14 +1752,15 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
|
||||
pMga->HWCursor ? "HW" : "SW");
|
||||
|
||||
|
||||
if (pMga->DualHeadEnabled) {
|
||||
#ifdef MGADRI
|
||||
pMga->GetQuiescence = MGAGetQuiescenceShared;
|
||||
#endif
|
||||
} else { /* single-head mode */
|
||||
pMga->SecondCrtc = FALSE;
|
||||
pMga->HWCursor = TRUE;
|
||||
#ifdef MGADRI
|
||||
pMga->GetQuiescence = MGAGetQuiescence;
|
||||
#endif
|
||||
@ -1977,24 +2024,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
}
|
||||
#endif
|
||||
|
||||
from = X_DEFAULT;
|
||||
|
||||
/*
|
||||
* The preferred method is to use the "hw cursor" option as a tri-state
|
||||
* option, with the default set above.
|
||||
*/
|
||||
if (xf86GetOptValBool(pMga->Options, OPTION_HW_CURSOR, &pMga->HWCursor)) {
|
||||
from = X_CONFIG;
|
||||
}
|
||||
|
||||
/* For compatibility, accept this too (as an override) */
|
||||
if (xf86ReturnOptValBool(pMga->Options, OPTION_SW_CURSOR, FALSE)) {
|
||||
from = X_CONFIG;
|
||||
pMga->HWCursor = FALSE;
|
||||
}
|
||||
xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
|
||||
pMga->HWCursor ? "HW" : "SW");
|
||||
|
||||
if (xf86ReturnOptValBool(pMga->Options, OPTION_NOACCEL, FALSE)) {
|
||||
pMga->NoAccel = TRUE;
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
|
||||
@ -2679,30 +2708,55 @@ MGAMapMem(ScrnInfoPtr pScrn)
|
||||
#ifdef XSERVER_LIBPCIACCESS
|
||||
struct pci_device *const dev = pMga->PciInfo;
|
||||
struct pci_mem_region *region;
|
||||
void **memory[2];
|
||||
int i, err;
|
||||
#endif
|
||||
|
||||
|
||||
if (!pMga->FBDev) {
|
||||
#ifdef XSERVER_LIBPCIACCESS
|
||||
memory[pMga->io_bar] = &pMga->IOBase;
|
||||
memory[pMga->framebuffer_bar] = &pMga->FbBase;
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
region = &dev->regions[i];
|
||||
pciaddr_t fbaddr = pMga->FbAddress;
|
||||
pciaddr_t fbsize = pMga->FbMapSize;
|
||||
err = pci_device_map_range(dev,
|
||||
region->base_addr, region->size,
|
||||
fbaddr, fbsize,
|
||||
PCI_DEV_MAP_FLAG_WRITABLE,
|
||||
memory[i]);
|
||||
(void **)&pMga->FbBase);
|
||||
|
||||
if (err) {
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
||||
"Unable to map BAR %i. %s (%d)\n",
|
||||
i, strerror(err), err);
|
||||
"Unable to map Framebuffer %08llX %llx. %s (%d)\n",
|
||||
(long long)fbaddr, (long long)fbsize,
|
||||
strerror(err), err);
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
||||
"MAPPED Framebuffer %08llX %llx to %08llX.\n",
|
||||
(long long)fbaddr, (long long)fbsize,
|
||||
(long long)pMga->FbBase);
|
||||
|
||||
if(pMga->entityPrivate == NULL || pMga->entityPrivate->mappedIOUsage == 0) {
|
||||
region = &dev->regions[pMga->io_bar];
|
||||
err = pci_device_map_range(dev,
|
||||
region->base_addr, region->size,
|
||||
PCI_DEV_MAP_FLAG_WRITABLE,
|
||||
&pMga->IOBase);
|
||||
|
||||
if (err) {
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
||||
"Unable to map IO Region %i. %s (%d)\n",
|
||||
pMga->io_bar, strerror(err), err);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if(pMga->entityPrivate != NULL)
|
||||
pMga->entityPrivate->mappedIOBase = pMga->IOBase;
|
||||
}
|
||||
else
|
||||
pMga->IOBase = pMga->entityPrivate->mappedIOBase;
|
||||
|
||||
if(pMga->entityPrivate != NULL)
|
||||
pMga->entityPrivate->mappedIOUsage ++;
|
||||
|
||||
#else
|
||||
/*
|
||||
* For Alpha, we need to map SPARSE memory, since we need
|
||||
@ -2753,6 +2807,8 @@ MGAMapMem(ScrnInfoPtr pScrn)
|
||||
if (pMga->iload_bar != -1) {
|
||||
#ifdef XSERVER_LIBPCIACCESS
|
||||
region = &dev->regions[pMga->iload_bar];
|
||||
|
||||
if(pMga->entityPrivate == NULL || pMga->entityPrivate->mappedILOADUsage == 0) {
|
||||
err = pci_device_map_range(dev,
|
||||
region->base_addr, region->size,
|
||||
PCI_DEV_MAP_FLAG_WRITABLE,
|
||||
@ -2763,6 +2819,15 @@ MGAMapMem(ScrnInfoPtr pScrn)
|
||||
strerror(err), err);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if(pMga->entityPrivate != NULL)
|
||||
pMga->entityPrivate->mappedILOADBase = pMga->ILOADBase;
|
||||
}
|
||||
else
|
||||
pMga->ILOADBase = pMga->entityPrivate->mappedILOADBase;
|
||||
|
||||
if(pMga->entityPrivate != NULL)
|
||||
pMga->entityPrivate->mappedILOADUsage ++;
|
||||
#else
|
||||
pMga->ILOADBase = xf86MapPciMem(pScrn->scrnIndex,
|
||||
VIDMEM_MMIO | VIDMEM_MMIO_32BIT |
|
||||
@ -2792,10 +2857,20 @@ MGAUnmapMem(ScrnInfoPtr pScrn)
|
||||
|
||||
if (!pMga->FBDev) {
|
||||
#ifdef XSERVER_LIBPCIACCESS
|
||||
if(pMga->entityPrivate != NULL)
|
||||
pMga->entityPrivate->mappedIOUsage--;
|
||||
|
||||
if(pMga->entityPrivate == NULL || pMga->entityPrivate->mappedIOUsage == 0) {
|
||||
pci_device_unmap_range(dev, pMga->IOBase,
|
||||
dev->regions[pMga->io_bar].size);
|
||||
|
||||
if(pMga->entityPrivate != NULL)
|
||||
pMga->entityPrivate->mappedIOBase = NULL;
|
||||
}
|
||||
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "UNMAPPING framebuffer 0x%08llX, 0x%llX.\n", (long long)pMga->FbBase, (long long)pMga->FbMapSize);
|
||||
pci_device_unmap_range(dev, pMga->FbBase,
|
||||
dev->regions[pMga->framebuffer_bar].size);
|
||||
pMga->FbMapSize);
|
||||
#else
|
||||
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pMga->IOBase, 0x4000);
|
||||
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pMga->FbBase, pMga->FbMapSize);
|
||||
@ -2808,8 +2883,17 @@ MGAUnmapMem(ScrnInfoPtr pScrn)
|
||||
|
||||
if ((pMga->iload_bar != -1) && (pMga->ILOADBase != NULL)) {
|
||||
#ifdef XSERVER_LIBPCIACCESS
|
||||
if(pMga->entityPrivate != NULL)
|
||||
pMga->entityPrivate->mappedILOADUsage--;
|
||||
|
||||
if(pMga->entityPrivate == NULL || pMga->entityPrivate->mappedILOADUsage == 0) {
|
||||
pci_device_unmap_range(dev, pMga->ILOADBase,
|
||||
dev->regions[pMga->iload_bar].size);
|
||||
|
||||
if(pMga->entityPrivate != NULL)
|
||||
pMga->entityPrivate->mappedILOADBase = NULL;
|
||||
}
|
||||
|
||||
#else
|
||||
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pMga->ILOADBase, 0x800000);
|
||||
#endif
|
||||
@ -3114,11 +3198,13 @@ MGACrtc2FillStrip(ScrnInfoPtr pScrn)
|
||||
(pScrn->bitsPerPixel >> 3) * pScrn->displayWidth * pScrn->virtualY);
|
||||
} else {
|
||||
xf86SetLastScrnFlag(pScrn->entityList[0], pScrn->scrnIndex);
|
||||
#ifdef HAVE_XAA_H
|
||||
pMga->RestoreAccelState(pScrn);
|
||||
pMga->SetupForSolidFill(pScrn, 0, GXcopy, 0xFFFFFFFF);
|
||||
pMga->SubsequentSolidFillRect(pScrn, pScrn->virtualX, 0,
|
||||
pScrn->displayWidth - pScrn->virtualX,
|
||||
pScrn->virtualY);
|
||||
#endif
|
||||
MGAStormSync(pScrn);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
/****************************************************************************
|
||||
* mga_esc.c
|
||||
*
|
||||
* ESC call implementation
|
||||
*
|
||||
* (C) Matrox Graphics, Inc.
|
||||
*****************************************************************************/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
int mga_foo;
|
||||
@ -729,7 +729,7 @@ mgaDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
|
||||
{
|
||||
PMGA(pSrc);
|
||||
|
||||
char *src = pSrc->devPrivate.ptr;
|
||||
char *src = (char *) exaGetPixmapFirstPixel(pSrc);
|
||||
int src_pitch = exaGetPixmapPitch(pSrc);
|
||||
|
||||
int cpp = (pSrc->drawable.bitsPerPixel + 7) / 8;
|
||||
|
||||
@ -710,7 +710,11 @@ Bool mgaAccelInit( ScreenPtr pScreen )
|
||||
/* screen to screen color expansion */
|
||||
if(pMga->AccelFlags & USE_LINEAR_EXPANSION) {
|
||||
infoPtr->ScreenToScreenColorExpandFillFlags =
|
||||
#if X_BYTE_ORDER == X_BIG_ENDIAN
|
||||
BIT_ORDER_IN_BYTE_MSBFIRST;
|
||||
#else
|
||||
BIT_ORDER_IN_BYTE_LSBFIRST;
|
||||
#endif
|
||||
infoPtr->SetupForScreenToScreenColorExpandFill =
|
||||
mgaSetupForScreenToScreenColorExpandFill;
|
||||
infoPtr->SubsequentScreenToScreenColorExpandFill =
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Makefile.in generated by automake 1.12.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.12.6 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
|
||||
@ -196,6 +196,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
|
||||
PCIACCESS_LIBS = @PCIACCESS_LIBS@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user