xserver-xorg-video-mach64: Changes to 'debian-experimental'
ChangeLog | 354 -------------------------------
README | 8
configure.ac | 27 ++
debian/changelog | 20 +
debian/control | 2
debian/patches/series | 1
debian/xserver-xorg-video-mach64.install | 1
src/Makefile.am | 3
src/ati.h | 1
src/atiadjust.c | 14 -
src/atiadjust.h | 2
src/aticonsole.c | 45 +--
src/aticonsole.h | 8
src/atidga.c | 9
src/atidri.c | 50 ++--
src/atiload.c | 18 -
src/atimach64accel.c | 2
src/atimach64accel.h | 2
src/atimach64cursor.c | 4
src/atimach64exa.c | 16 -
src/atimach64probe.c | 2
src/atimach64render.c | 8
src/atimach64xv.c | 4
src/atipreinit.c | 2
src/atiprint.c | 4
src/atiprobe.c | 2
src/atiscreen.c | 48 +---
src/atiscreen.h | 4
src/atistruct.h | 10
src/ativalid.c | 6
src/ativalid.h | 2
src/atividmem.c | 14 +
src/compat-api.h | 101 ++++++++
33 files changed, 283 insertions(+), 511 deletions(-)
New commits:
commit 2ee176b81bbdbf4795637fa857d2f00425d0dbb2
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 16:12:05 2012 +0200
Bump Standards-Version to 3.9.3
diff --git a/debian/changelog b/debian/changelog
index 0ff4617..b66bfe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-mach64 (6.9.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.9.3
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 16:10:36 +0200
diff --git a/debian/control b/debian/control
index a0c0252..c2382dc 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
x11proto-xf86dri-dev,
quilt,
xutils-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-mach64
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-mach64.git
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..fdffa2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# placeholder
commit 4b8b42369cffa50ec209562617e8cb1f0003af2a
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 16:10:46 2012 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 772b465..0ff4617 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-mach64 (6.9.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 16:10:36 +0200
+
xserver-xorg-video-mach64 (6.9.1-2) unstable; urgency=low
* Drop usr/share/man from dh_install, there's no manpage to ship for
commit f83fe310851eaae4827b44eb119a86b1e782c940
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 16:10:28 2012 +0200
Bump changelog
diff --git a/ChangeLog b/ChangeLog
index dd67046..4a6395a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,389 +1,3 @@
-commit 5e09e744b27b5ada9dd064e250fa98eddf1a58c3
-Author: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Fri Mar 23 18:56:44 2012 -0700
-
- xf86-video-mach64 6.9.1
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
-commit fa20f8f2408ac81ff04d81196a56c907fba01c45
-Author: Adam Jackson <ajax@redhat.com>
-Date: Mon Dec 19 16:45:25 2011 -0500
-
- Fall back to shadowfb if XAA is unavailable
-
- Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-commit 0de234329fa1c3365954498819da93d64a978911
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sat Oct 29 18:53:48 2011 -0700
-
- Use pci_device_map_legacy rather than xf86MapDomainMemory
-
- Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-
-commit 75166a0fc92220b496eb67451ec1b11cb8b72091
-Author: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sat Oct 29 18:54:10 2011 -0700
-
- Use unsigned long rather than deprecated IOADDRESS
-
- Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-
-commit ef55d1f123972ccc001bf8b41db45d281be35a62
-Author: Julien Cristau <jcristau@debian.org>
-Date: Thu Apr 28 17:23:42 2011 +0200
-
- Bump to 6.9.0
-
- Signed-off-by: Julien Cristau <jcristau@debian.org>
-
-commit 39c6d1da8af563afa665d5bb149c9693e24c6eab
-Author: Julien Cristau <jcristau@debian.org>
-Date: Thu Apr 28 17:31:52 2011 +0200
-
- Replace deprecated xalloc/xfree/xrealloc with malloc/free/realloc
-
- Signed-off-by: Julien Cristau <jcristau@debian.org>
-
-commit d60087f0b6dd4d082230312580ae35e14acd0c6e
-Author: Dave Airlie <airlied@redhat.com>
-Date: Thu Dec 2 19:11:05 2010 +1000
-
- mach64: fix the pixmap private API change.
-
-commit e7bc106247d9ba10a922936e137a4f5ecc54ef9e
-Author: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Sat Oct 30 09:37:17 2010 -0700
-
- Sun's copyrights now belong to Oracle
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
-commit 1732886624c7590a8084bb7d92e87ff341aa6d66
-Author: Mark Kettenis <kettenis@openbsd.org>
-Date: Sun Aug 29 18:07:01 2010 +0200
-
- Don't play wrapping games
-
- The driver calls the wrapped CloseScreen function in the middle of messing
- with the hardware state. On multi-card setups this may cause the VGA
- arbiter to switch to a different card while we're in the middle of things,
- with obvious disastrous effects. This fixes things by making sure we
- only call the wrapped CloseScreen function at the very end of the driver's
- CloseScreen function.
-
- Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
-
-commit 7a1549678a19c6e94e1ecb3223c74effbd5009d2
-Author: Mark Kettenis <kettenis@openbsd.org>
-Date: Sun Aug 29 17:54:19 2010 +0200
-
- Don't attempt to stop video on Mach64's without hardware overlay support
-
- Older Mach64 variants don't have hardware overlay support. This is handled
- properly when the XVideo adapter is initialized (we bail out early), but
- ATICloseXVideo() unconditionally tries to stop video during screen termination.
- This causes the server to hang on certain multi-card setups. Fix the issue
- by checking Block1Base before proceeding with stopping video.
-
- Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
-
-commit 88a176df8df09812719eb179b293ce4dc851f2e5
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed Jul 21 16:49:04 2010 -0400
-
- config: add comments for main statements
-
-commit 18ee3aa1b7a4c9de9cc705cb10e05864d3ab6406
-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>
-
-commit d061e00d4d09e8fbecc8bad95354551d36197dd4
-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>
-
-commit 69da993c9bdb8982c650533ca44a34fa2d7589fa
-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>
-
-commit 37f35b579e9ea1a4b5b50f3ae570e3329664c38e
-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>
-
-commit 1cb6b6939e5d466797721a2e59afdd067e769fcc
-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>
-
-commit 590d1989f22c38d8db01146b2207d440bc59f285
-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>
-
-commit 7bf12fb07625bd5503c5de3e5e07bd69c6de54b3
-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>
-
-commit 3518273c2117c0d8e51efecb2f9184d5f8274ae0
-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>
-
-commit 03dd23597e64f440e5530bd8bfbd222b8f825d5a
-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>
-
-commit d5b5e2bb4139b723df35a422b945d514caf4db2d
-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.
-
-commit 6da9520fe6c482c1d4cb9dd6119c13789ed9715a
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Mon Jun 21 10:37:11 2010 -0400
-
- config: remove optional check for xf86miscproto
-
- This extension is obsolete and is not used by this driver.
-
- Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit 1f1e665f7dab55eceb314adb185636b8ee64fbc6
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Mon Jun 14 08:43:04 2010 -0400
-
- README: keep the text version of README, discard the sgml version
-
- The linuxdoc doc tool is deprecated.
- README files are exclusively text files.
- Normalize to one plain text README file.
-
- Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit 2863c5617ccb4a09a699c43c72d9b496480db102
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Mon Jun 14 08:38:59 2010 -0400
-
- README: fix linuxdoc content
-
- defs.ent are located under X11 directory
- ident tag is not a Linuxdoc tag
- replace docbook email tag with linuxdoc email tag
-
- Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit ebfb29a00384ae8070d9f10726c591c0ca92637c
-Author: Matt Turner <mattst88@gmail.com>
-Date: Mon Mar 8 10:52:54 2010 -0500
-
- Don't check for Xinerama.
-
- It doesn't seem to be used anywhere, so don't require it.
-
- CC: Jerome Glisse <jglisse@redhat.com>
- CC: Alex Deucher <alexdeucher@gmail.com>
- CC: Dave Airlie <airlied@redhat.com>
- Signed-off-by: Matt Turner <mattst88@gmail.com>
-
-commit 383903574b9660f9d7831b149f2a9b339a871586
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Fri Jan 15 15:54:36 2010 -0800
-
- Update Sun license notices to current X.Org standard form
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-
-commit 0059e1e49b1e6861aad801b93ccf846a236a42a7
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Tue Dec 15 21:47:06 2009 -0500
-
- configure.ac: use backticks rather than $() for cmd subs
-
- Use "$PKG_CONFIG" rather than hard coded "pkg-config"
-
- Acked-by: Dan Nicholson <dbn.lists@gmail.com>
- Acked-by: Daniel Stone <daniel@fooishbar.org>
-
- Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit 8f84a92309e62655de69c09affa2e6922cc46aa1
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Mon Nov 23 09:25:05 2009 -0500
-
- Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
-
- Now that the INSTALL file is generated.
- Allows running make maintainer-clean.
-
-commit da3afdb69d426db6423c505f1c4ec10b9cd40304
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed Oct 28 14:41:41 2009 -0400
-
- INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
-
- Automake 'foreign' option is specified in configure.ac.
- Remove from Makefile.am
-
-commit a0b11f322c440ccf13347c42d08ed5e0b208d79c
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed Oct 28 14:09:09 2009 -0400
-
- INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
-
- Add missing INSTALL file. Use standard GNU file on building tarball
- README may have been updated
- Remove AUTHORS file as it is empty and no content available yet.
- Remove NEWS file as it is empty and no content available yet.
-
-commit 963be32d684b32957d7e646eb19259d7710bf66a
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Mon Oct 26 12:54:21 2009 -0400
-
- Several driver modules do not have a ChangeLog target in Makefile.am #23814
-
- The git generated ChangeLog replaces the hand written one.
- Update configure.ac to xorg-macros level 1.3.
- Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
- Update Makefile.am to add ChangeLog target if missing
- Remove ChangeLog from EXTRA_DIST or *CLEAN variables
- This is a pre-req for the INSTALL_CMD
-
-commit 3e54585250d22541a31068b5b8f0c8743dbccce6
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Thu Oct 22 12:34:17 2009 -0400
-
- .gitignore: use common defaults with custom section # 24239
-
- Using common defaults will reduce errors and maintenance.
- Only the very small or inexistent custom section need periodic maintenance
- when the structure of the component changes. Do not edit defaults.
-
-commit 2013b64cf19fce32edb052ee6d8529d3ce69d409
-Author: Dave Airlie <airlied@redhat.com>
-Date: Thu Jul 30 12:04:28 2009 +1000
-
- mach64: bump for release 6.8.2
-
-commit 4f08e83e50059df494f5f53cd05eb8809d18656e
-Author: Dave Airlie <airlied@redhat.com>
-Date: Tue Jul 28 15:22:40 2009 +1000
-
- mach64: change to using ABI version check
-
-commit 64960253ea5dcfb01d92b5b684790f16be5b73be
-Author: Dave Airlie <airlied@redhat.com>
-Date: Tue Jul 28 13:32:31 2009 +1000
-
- mach64: update for resources/RAC API removal
-
-commit 965614f27d42106e859000264a6eb89d9fcba67e
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu Jul 16 11:43:33 2009 +1000
-
- Update to xextproto 7.1 support.
-
- DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
- need to include dpmsconst.h if xextproto 7.1 is available.
-
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
-commit 9caef14defaf892d957875f6d774003a036bad45
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Mon May 11 22:06:40 2009 -0700
-
- Fill in COPYING file, add SubmittingPatches URL to README
-
-commit d9d787167795862909738892195fcdc751c413ed
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Sun May 10 16:56:02 2009 -0700
-
- Doublecheck pictFormat is a supported format
-
- Fixes these warnings from parfait source checker:
-
- Error: Read buffer overflow at src/atimach64render.c:601
- in function 'Mach64PrepareTexture' [Symbolic analysis]
- In array dereference of Mach64TexFormats[i] with index 'i'
- Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6
- Error: Read buffer overflow at src/atimach64render.c:712
- in function 'Mach64PrepareComposite' [Symbolic analysis]
- In array dereference of Mach64TexFormats[i] with index 'i'
- Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-
-commit 99db87ed49d7eca8de2ff1f7d53b580637ebb916
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Wed Apr 29 17:32:47 2009 -0700
-
- Version 6.8.1
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-
-commit 193744b015e8f2b8c25d90094b7f0b502bc1287b
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Wed Apr 29 17:21:53 2009 -0700
-
- Convert to XORG_CWARNFLAGS & XORG_CHANGELOG
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-
commit d394e0b8269ea0a7d36ee8edb38947df170399c9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 20:41:43 2009 -0800
commit 2776fc9cd69f18ba6f09f39ca747f3a9333bf9e4
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 17 16:05:09 2012 +1000
xf86-video-mach64: bump to version 6.9.3
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/configure.ac b/configure.ac
index 90207a4..2282f79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-mach64],
- [6.9.2],
+ [6.9.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-mach64])
AC_CONFIG_SRCDIR([Makefile.am])
commit a2213da6d87baa8b5f49d3894513ced2c6974259
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 16 04:29:53 2012 +0100
mach64: fix build against server without XAA
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/configure.ac b/configure.ac
index 6308c92..90207a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,8 +162,6 @@ if test "x$ATIMISC_TV_OUT" = xyes; then
AC_DEFINE(TV_OUT, 1, [Build TV-Out support for atimisc.])
fi
-AC_DEFINE(USE_XAA, 1, [Build support for XAA])
-
# Properly handle EXA.
AC_MSG_CHECKING([whether to enable EXA support])
if test "x$EXA" = xyes; then
@@ -197,6 +195,27 @@ if test "x$have_exa_h" = xyes; then
fi
fi
+AC_ARG_ENABLE(xaa,
+ AS_HELP_STRING([--enable-xaa],
+ [Enable legacy X Acceleration Architecture (XAA) [default=auto]]),
+ [XAA="$enableval"],
+ [XAA=auto])
+if test "x$XAA" != xno; then
+ save_CFLAGS=$CFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+ CFLAGS=$XORG_CFLAGS
+ CPPFLAGS="$XORG_CFLAGS"
+ AC_CHECK_HEADERS([xaa.h], XAA=yes, XAA=no)
+ CFLAGS=$save_CFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+fi
+AC_MSG_CHECKING([whether to include XAA support])
+AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
+if test "x$XAA" = xyes; then
+ AC_DEFINE(USE_XAA, test "x$XAA" = xyes, [Build support for XAA])
+fi
+AC_MSG_RESULT([$XAA])
+
AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
[XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
[#include "xorg-server.h"])
diff --git a/src/atimach64accel.h b/src/atimach64accel.h
index a8585d5..92fb4df 100644
--- a/src/atimach64accel.h
+++ b/src/atimach64accel.h
@@ -25,7 +25,9 @@
#include "atipriv.h"
+#ifdef HAVE_XAA_H
#include "xaa.h"
+#endif
#include "exa.h"
#define ATIMach64MaxX 4095
commit 3fce61b475355820f735e50b7070ee6fc906083d
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 2 12:23:03 2012 +0100
mach64: bump to 6.9.2
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/configure.ac b/configure.ac
index 2b2d41a..6308c92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-mach64],
- [6.9.1],
+ [6.9.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-mach64])
AC_CONFIG_SRCDIR([Makefile.am])
commit 68572c1e41cf6de2f0ef2c9442111384ce863308
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 6 10:42:26 2012 +0100
ati: only include deprecated file in one place.
reduces warnings.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/ati.h b/src/ati.h
index 828aae1..9a6c244 100644
--- a/src/ati.h
+++ b/src/ati.h
@@ -25,7 +25,6 @@
#include <unistd.h>
#include "xf86Pci.h"
-#include "xf86PciInfo.h"
#include "xf86.h"
diff --git a/src/atimach64probe.c b/src/atimach64probe.c
index 0117920..e94c3f2 100644
--- a/src/atimach64probe.c
+++ b/src/atimach64probe.c
@@ -38,6 +38,8 @@
#include "atiadjust.h"
#include "ativalid.h"
+#include "xf86PciInfo.h"
+
#ifndef XSERVER_LIBPCIACCESS
static Bool Mach64Probe(DriverPtr pDriver, int flags);
#endif
commit a9f3a66e355b9f19c312d399771fb1d8eb2e046d
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 6 10:41:11 2012 +0100
mach64: port to new compat API.
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 7331cb1..4c1498f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,4 +107,5 @@ EXTRA_DIST = \
mach64_common.h \
mach64_dri.h \
mach64_sarea.h \
- atipcirename.h
+ atipcirename.h \
+ compat-api.h
diff --git a/src/atiadjust.c b/src/atiadjust.c
index 267186f..7e3e4f8 100644
--- a/src/atiadjust.c
+++ b/src/atiadjust.c
@@ -25,12 +25,14 @@
#endif
#include "ati.h"
-#include "atiadjust.h"
+#include "atistruct.h"
#include "atichip.h"
#include "atilock.h"
#include "atimach64io.h"
#include "atiwonderio.h"
+#include "atiadjust.h"
+
/*
* The display start address is expressed in units of 32-bit (VGA) or 64-bit
* (accelerator) words where all planar modes are considered as 4bpp modes.
@@ -83,15 +85,9 @@ ATIAdjustPreInit
* window.
*/
void
-ATIAdjustFrame
-(
- int scrnIndex,
- int x,
- int y,
- int flags
-)
+ATIAdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[scrnIndex];
+ SCRN_INFO_PTR(arg);
ATIPtr pATI = ATIPTR(pScreenInfo);
int Base, xy;
diff --git a/src/atiadjust.h b/src/atiadjust.h
index 58c6efc..9509596 100644
--- a/src/atiadjust.h
+++ b/src/atiadjust.h
@@ -26,6 +26,6 @@
#include "atipriv.h"
extern void ATIAdjustPreInit(ATIPtr);
-extern void ATIAdjustFrame(int, int, int, int);
+extern void ATIAdjustFrame(ADJUST_FRAME_ARGS_DECL);
#endif /* ___ATIADJUST_H___ */
diff --git a/src/aticonsole.c b/src/aticonsole.c
index 50cc6e1..47e9edd 100644
--- a/src/aticonsole.c
+++ b/src/aticonsole.c
@@ -30,7 +30,6 @@
#include "xorgVersion.h"
#include "ati.h"
-#include "aticonsole.h"
#include "atii2c.h"
#include "atilock.h"
#include "atimach64.h"
@@ -39,6 +38,7 @@
#include "atistruct.h"
#include "ativga.h"
#include "atividmem.h"
+#include "aticonsole.h"
#ifdef XF86DRI_DEVEL
#include "mach64_common.h"
@@ -75,7 +75,7 @@ ATISaveScreen
if (!pScreen)
return TRUE;
- pScreenInfo = xf86Screens[pScreen->myNum];
+ pScreenInfo = xf86ScreenToScrn(pScreen);
if (!pScreenInfo->vtSema)
return TRUE;
@@ -558,8 +558,8 @@ ATIEnterGraphics
(void)ATISaveScreen(pScreen, SCREEN_SAVER_ON);
/* Position the screen */
- (*pScreenInfo->AdjustFrame)(pScreenInfo->scrnIndex,
- pScreenInfo->frameX0, pScreenInfo->frameY0, 0);
+ (*pScreenInfo->AdjustFrame)(ADJUST_FRAME_ARGS(pScreenInfo,
+ pScreenInfo->frameX0, pScreenInfo->frameY0));
SetTimeSinceLastInputEvent();
@@ -621,18 +621,13 @@ ATILeaveGraphics
* This function switches to another graphics video state.
*/
Bool
-ATISwitchMode
-(
- int iScreen,
- DisplayModePtr pMode,
- int flags
-)
+ATISwitchMode(SWITCH_MODE_ARGS_DECL)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[iScreen];
+ SCRN_INFO_PTR(arg);
ATIPtr pATI = ATIPTR(pScreenInfo);
/* Calculate new hardware data */
- if (!ATIModeCalculate(iScreen, pATI, &pATI->NewHW, pMode))
+ if (!ATIModeCalculate(pScreenInfo->scrnIndex, pATI, &pATI->NewHW, pMode))
return FALSE;
/* Set new hardware state */
@@ -680,13 +675,9 @@ ATISwitchMode
* This function sets the server's virtual console to a graphics video state.
*/
Bool
-ATIEnterVT
-(
- int iScreen,
- int flags
-)
+ATIEnterVT(VT_FUNC_ARGS_DECL)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[iScreen];
+ SCRN_INFO_PTR(arg);
ScreenPtr pScreen = pScreenInfo->pScreen;
ATIPtr pATI = ATIPTR(pScreenInfo);
PixmapPtr pScreenPixmap;
@@ -757,13 +748,9 @@ ATIEnterVT
* entry.
*/
void
-ATILeaveVT
-(
- int iScreen,
- int flags
-)
+ATILeaveVT(VT_FUNC_ARGS_DECL)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[iScreen];
+ SCRN_INFO_PTR(arg);
ScreenPtr pScreen = pScreenInfo->pScreen;
ATIPtr pATI = ATIPTR(pScreenInfo);
@@ -786,16 +773,12 @@ ATILeaveVT
* This function frees all driver data related to a screen.
*/
void
-ATIFreeScreen
-(
- int iScreen,
- int flags
-)
+ATIFreeScreen(FREE_SCREEN_ARGS_DECL)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[iScreen];
+ SCRN_INFO_PTR(arg);
ATIPtr pATI = ATIPTR(pScreenInfo);
- ATII2CFreeScreen(iScreen);
+ ATII2CFreeScreen(pScreenInfo->scrnIndex);
#ifndef AVOID_CPIO
diff --git a/src/aticonsole.h b/src/aticonsole.h
index 7e1084a..0dd18cc 100644
--- a/src/aticonsole.h
+++ b/src/aticonsole.h
@@ -33,11 +33,11 @@ extern void ATISetDPMSMode(ScrnInfoPtr, int, int);
extern Bool ATIEnterGraphics(ScreenPtr, ScrnInfoPtr, ATIPtr);
extern void ATILeaveGraphics(ScrnInfoPtr, ATIPtr);
-extern Bool ATISwitchMode(int, DisplayModePtr, int);
+extern Bool ATISwitchMode(SWITCH_MODE_ARGS_DECL);
-extern Bool ATIEnterVT(int, int);
-extern void ATILeaveVT(int, int);
+extern Bool ATIEnterVT(VT_FUNC_ARGS_DECL);
+extern void ATILeaveVT(VT_FUNC_ARGS_DECL);
-extern void ATIFreeScreen(int, int);
+extern void ATIFreeScreen(FREE_SCREEN_ARGS_DECL);
#endif /* ___ATICONSOLE_H___ */
diff --git a/src/atidga.c b/src/atidga.c
index c1cd163..2560e6b 100644
--- a/src/atidga.c
+++ b/src/atidga.c
@@ -28,12 +28,12 @@
#include <string.h>
#include "ati.h"
-#include "atiadjust.h"
#include "atichip.h"
#include "atidac.h"
#include "atidga.h"
#include "atimode.h"
#include "atistruct.h"
+#include "atiadjust.h"
#include "dgaproc.h"
@@ -94,7 +94,6 @@ ATIDGASetMode
{
ATIPtr pATI = ATIPTR(pScreenInfo);
DisplayModePtr pMode;
- int iScreen = pScreenInfo->scrnIndex;
int frameX0, frameY0;
if (pDGAMode)
@@ -128,11 +127,11 @@ ATIDGASetMode
ATIAdjustPreInit(pATI);
ATIModePreInit(pScreenInfo, pATI, &pATI->NewHW);
- if (!(*pScreenInfo->SwitchMode)(iScreen, pMode, 0))
+ if (!(*pScreenInfo->SwitchMode)(SWITCH_MODE_ARGS(pScreenInfo, pMode)))
return FALSE;
if (!pDGAMode)
pATI->currentMode = NULL;
- (*pScreenInfo->AdjustFrame)(iScreen, frameX0, frameY0, 0);
+ (*pScreenInfo->AdjustFrame)(ADJUST_FRAME_ARGS(pScreenInfo, frameX0, frameY0));
return TRUE;
}
@@ -151,7 +150,7 @@ ATIDGASetViewport
int flags
)
{
- (*pScreenInfo->AdjustFrame)(pScreenInfo->pScreen->myNum, x, y, flags);
+ (*pScreenInfo->AdjustFrame)(ADJUST_FRAME_ARGS(pScreenInfo, x, y));
}
/*
diff --git a/src/atidri.c b/src/atidri.c
index 9c6719b..96804ff 100644
--- a/src/atidri.c
+++ b/src/atidri.c
@@ -67,7 +67,7 @@ static char ATIClientDriverName[] = "mach64";
*/
static Bool ATIInitVisualConfigs( ScreenPtr pScreen )
{
- ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen);
ATIPtr pATI = ATIPTR(pScreenInfo);
int numConfigs = 0;
__GLXvisualConfig *pConfigs = NULL;
@@ -290,7 +290,7 @@ static void ATIDestroyContext( ScreenPtr pScreen, drm_context_t hwContext,
*/
static void ATIEnterServer( ScreenPtr pScreen )
{
- ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen);
ATIPtr pATI = ATIPTR(pScreenInfo);
if ( pATI->directRenderingEnabled ) {
@@ -336,7 +336,7 @@ static void ATIDRISwapContext( ScreenPtr pScreen,
#ifdef USE_XAA
static void ATIDRITransitionTo2d(ScreenPtr pScreen)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen);
ATIPtr pATI = ATIPTR(pScreenInfo);
if (pATI->backArea) {
@@ -352,7 +352,7 @@ static void ATIDRITransitionTo2d(ScreenPtr pScreen)
static void ATIDRITransitionTo3d(ScreenPtr pScreen)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen);
ATIPtr pATI = ATIPTR(pScreenInfo);
FBAreaPtr fbArea;
int width, height;
@@ -406,31 +406,31 @@ static void ATIDRITransitionTo3d(ScreenPtr pScreen)
#ifdef USE_EXA
static void ATIDRITransitionTo2d_EXA(ScreenPtr pScreen)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen);
ATIPtr pATI = ATIPTR(pScreenInfo);
ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo;
- exaEnableDisableFBAccess(pScreen->myNum, FALSE);
+ exaEnableDisableFBAccess(SCREEN_ARG(pScreen), FALSE);
pATI->pExa->offScreenBase = pATIDRIServer->backOffset;
- exaEnableDisableFBAccess(pScreen->myNum, TRUE);
+ exaEnableDisableFBAccess(SCREEN_ARG(pScreen), TRUE);
pATI->have3DWindows = FALSE;
}
static void ATIDRITransitionTo3d_EXA(ScreenPtr pScreen)
{
- ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen);
ATIPtr pATI = ATIPTR(pScreenInfo);
ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo;
- exaEnableDisableFBAccess(pScreen->myNum, FALSE);
+ exaEnableDisableFBAccess(SCREEN_ARG(pScreen), FALSE);
pATI->pExa->offScreenBase = pATIDRIServer->textureOffset +
pATIDRIServer->textureSize;
- exaEnableDisableFBAccess(pScreen->myNum, TRUE);
+ exaEnableDisableFBAccess(SCREEN_ARG(pScreen), TRUE);
pATI->have3DWindows = TRUE;
}
@@ -441,7 +441,7 @@ static void ATIDRIInitBuffers( WindowPtr pWin, RegionPtr prgn, CARD32 indx )
{
#ifdef USE_XAA
ScreenPtr pScreen = pWin->drawable.pScreen;
- ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen);
ATIPtr pATI = ATIPTR(pScreenInfo);
ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo;
XAAInfoRecPtr pXAAInfo = pATI->pXAAInfo;
@@ -508,7 +508,7 @@ static void ATIDRIMoveBuffers( WindowPtr pWin, DDXPointRec ptOldOrg,
{
#ifdef USE_XAA
ScreenPtr pScreen = pWin->drawable.pScreen;
- ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen);
ATIPtr pATI = ATIPTR(pScreenInfo);
XAAInfoRecPtr pXAAInfo = pATI->pXAAInfo;
@@ -686,7 +686,7 @@ static int Mach64MinBits(int val)
static Bool ATIDRISetBufSize( ScreenPtr pScreen, unsigned int maxSize )
{
- ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen);
ATIPtr pATI = ATIPTR(pScreenInfo);
ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo;
@@ -716,7 +716,7 @@ static Bool ATIDRISetBufSize( ScreenPtr pScreen, unsigned int maxSize )
static Bool ATIDRISetAgpMode( ScreenPtr pScreen )
Reply to: