xserver-xorg-video-mach64: Changes to 'debian-unstable'
ChangeLog | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++
README | 8 +-
configure.ac | 25 +++++++-
debian/changelog | 20 ++++++
debian/control | 4 -
debian/patches/series | 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/atimach64accel.c | 2
src/atimach64accel.h | 2
src/atimach64cursor.c | 4 -
src/atimach64exa.c | 76 ++----------------------
src/atimach64probe.c | 2
src/atimach64render.c | 25 +-------
src/atimach64xv.c | 4 -
src/atipreinit.c | 2
src/atiscreen.c | 69 +++++++---------------
src/atiscreen.h | 4 -
src/atistruct.h | 3
src/ativalid.c | 6 -
src/ativalid.h | 2
src/compat-api.h | 101 ++++++++++++++++++++++++++++++++
28 files changed, 415 insertions(+), 232 deletions(-)
New commits:
commit 5d02b62211118b4c0ed68cf36d6981b21dca0413
Author: Michele Cane <michele.cane@gmail.com>
Date: Fri Sep 6 16:51:29 2013 +0200
Bump Standards-Version to 3.9.4, no changes needed.
diff --git a/debian/changelog b/debian/changelog
index dedd05b..8ab2955 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-mach64 (6.9.4-1) UNRELEASED; urgency=low
[ Michele Cane ]
* New upstream release.
* Drop 01_fix_build.diff
+ * Bump Standards-Version to 3.9.4, no changes needed.
-- Michele Cane <michele.cane@gmail.com> Fri, 06 Sep 2013 16:39:00 +0200
diff --git a/debian/control b/debian/control
index c2382dc..4d7b49c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
x11proto-xf86dri-dev,
quilt,
xutils-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
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
commit 0634f7530d5235671ce6bfe17f9e6b6354a91a81
Author: Michele Cane <michele.cane@gmail.com>
Date: Fri Sep 6 16:49:34 2013 +0200
Drop 01_fix_build.diff
diff --git a/debian/changelog b/debian/changelog
index e8081d3..dedd05b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-mach64 (6.9.4-1) UNRELEASED; urgency=low
[ Michele Cane ]
* New upstream release.
+ * Drop 01_fix_build.diff
-- Michele Cane <michele.cane@gmail.com> Fri, 06 Sep 2013 16:39:00 +0200
diff --git a/debian/patches/01_fix_build.diff b/debian/patches/01_fix_build.diff
deleted file mode 100644
index 22b1d3b..0000000
--- a/debian/patches/01_fix_build.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/atiscreen.c b/src/atiscreen.c
-index 2957877..b1fbd3c 100644
---- a/src/atiscreen.c
-+++ b/src/atiscreen.c
-@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
- #ifdef TV_OUT
- /* Fix-up TV out after ImpacTV probe */
- if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO)
-- ATISwitchMode(0, pScreenInfo->currentMode, 0);
-+ ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, pScreenInfo->currentMode));
- #endif /* TV_OUT */
-
- #ifdef XF86DRI_DEVEL
diff --git a/debian/patches/series b/debian/patches/series
index 1f24f51..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_fix_build.diff
+
commit 0d2049af6a7b9db862c9e876e4fbf56480b8d68a
Author: Michele Cane <michele.cane@gmail.com>
Date: Fri Sep 6 16:40:14 2013 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 4a6395a..fe45b7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,544 @@
+commit 0d8639f3cd4128ae856ae27f3787c1da224bb564
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Dec 19 22:14:08 2012 -0800
+
+ xf86-video-mach64 6.9.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f694490b3cec78d7b17eeb0a9c4daadd1028776a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Dec 18 15:42:30 2012 -0800
+
+ Remove call to obsolete miInitializeBackingStore()
+
+ Definition was deleted from Xorg during 1.14 merge window, but has
+ been a no-op since 1.10 merge window.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit ece8d3557eb1ffb27104bffb7841503aae4dcd6f
+Author: Connor Behan <connor.behan@gmail.com>
+Date: Fri Dec 7 13:53:38 2012 -0800
+
+ Remove dummy UTS / DFS hooks
+
+ When EXA was added to mach64, it included UploadToScreen and
+ DownloadFromScreen hooks that did the same thing that EXA would do in a
+ software fallback. Now they are out of date and cause crashes. The
+ slight benefit of reimplementing those hooks (if there is any) is not
+ worth the maintenance burden of having to rewrite them every time there
+ is a change to the way EXA handles pixmaps.
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=51137
+
+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
+ Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f0d44c18d71e7450b99189c1221a2f89c7817ab6
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 6 16:49:12 2012 -0800
+
+ Mach64PixelARGB should use exaGetPixmapFirstPixel
+
+ Fixes crash attempting to read a pixel from a NULL pPixmap->devPrivate.ptr
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Michel Dänzer <michel@daenzer.net>
+
+commit 42c4e423eec789606eec9703be23a9fd4483a14a
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Oct 2 10:19:47 2012 -0400
+
+ Fix build with neither XAA nor EXA against xserver 1.13.0
+
+ Pull in picturestr.h to get GLYPH_HAS_GLYPH_PICTURE_ACCESSOR defined
+ before compat-api.h is parsed, otherwise you fail with:
+
+ In file included from /usr/include/xorg/picturestr.h:28:0,
+ from /usr/include/xorg/exa.h:38,
+ from atimach64accel.h:31,
+ from atiscreen.c:46:
+ /usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '*' token
+ /usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '(' token
+ /usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '*' token
+ /usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '(' token
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 104e3e067a7dcac143cb672fe42d56396ba6087b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Sep 26 16:21:25 2012 -0400
+
+ Don't gratuitously disable Render when ShadowFBing
+
+ There's no reason to do this, and I am at a loss to explain why that was
+ ever done. The first instance of this logic comes from xfree86 (over 11
+ years ago!):
+
+ http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c.diff?r1=1.15&r2=1.16
+
+ Now, cfb never had Render support, so that might make some sense if
+ there was an intermediate uncommitted state where the driver used fb for
+ direct but cfb for shadowed. But that's really the only plausible
+ explanation I can think of.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c
+Author: Dave Airlie <airlied@gmail.com>
+Date: Wed Jul 18 18:46:49 2012 +1000
+
+ mach64: fix build on 32-bit.
+
+ tvout code only builds on 32-bit, fix build.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+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>
+
+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>
+
+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>
+
+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>
+
+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>
+
+commit 84468ba28853fa57170025d9c25cb0029a386ff4
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Mar 30 19:02:07 2012 -0700
+
+ Readme updates
+
+ Stop saying Radeon & Rage128 are not "yet" supported by this driver,
+ since no one is working on reuniting the ATI driver family.
+
+ Update URL to check for latest X.Org code releases.
+
+ Stop calling it an "XAA" driver now that it also supports EXA.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+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
diff --git a/debian/changelog b/debian/changelog
index 5ad0c9b..e8081d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-mach64 (6.9.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-mach64 (6.9.4-1) UNRELEASED; urgency=low
+ [ Maarten Lankhorst ]
* New upstream release.
* Bump Standards-Version to 3.9.3
* Add 01_fix_build.diff to build on new X
- -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 16:10:36 +0200
+ [ Michele Cane ]
+ * New upstream release.
+
+ -- Michele Cane <michele.cane@gmail.com> Fri, 06 Sep 2013 16:39:00 +0200
xserver-xorg-video-mach64 (6.9.1-2) unstable; urgency=low
commit 0d8639f3cd4128ae856ae27f3787c1da224bb564
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Dec 19 22:14:08 2012 -0800
xf86-video-mach64 6.9.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 2282f79..95f336b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-mach64],
- [6.9.3],
+ [6.9.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-mach64])
AC_CONFIG_SRCDIR([Makefile.am])
commit f694490b3cec78d7b17eeb0a9c4daadd1028776a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Dec 18 15:42:30 2012 -0800
Remove call to obsolete miInitializeBackingStore()
Definition was deleted from Xorg during 1.14 merge window, but has
been a no-op since 1.10 merge window.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/src/atiscreen.c b/src/atiscreen.c
index 62a4dd9..15f399e 100644
--- a/src/atiscreen.c
+++ b/src/atiscreen.c
@@ -532,7 +532,6 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
#endif /* AVOID_DGA */
/* Initialise backing store */
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
/* Initialise cursor */
commit ece8d3557eb1ffb27104bffb7841503aae4dcd6f
Author: Connor Behan <connor.behan@gmail.com>
Date: Fri Dec 7 13:53:38 2012 -0800
Remove dummy UTS / DFS hooks
When EXA was added to mach64, it included UploadToScreen and
DownloadFromScreen hooks that did the same thing that EXA would do in a
software fallback. Now they are out of date and cause crashes. The
slight benefit of reimplementing those hooks (if there is any) is not
worth the maintenance burden of having to rewrite them every time there
is a change to the way EXA handles pixmaps.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=51137
Signed-off-by: Connor Behan <connor.behan@gmail.com>
Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/atimach64exa.c b/src/atimach64exa.c
index e4d5307..ea4c98e 100644
--- a/src/atimach64exa.c
+++ b/src/atimach64exa.c
@@ -387,60 +387,6 @@ Mach64Solid
static void Mach64DoneSolid(PixmapPtr pPixmap) { }
-/*
- * Memcpy-based UTS.
- */
-static Bool
-Mach64UploadToScreen(PixmapPtr pDst, int x, int y, int w, int h,
- char *src, int src_pitch)
-{
- char *dst = pDst->devPrivate.ptr;
- int dst_pitch = exaGetPixmapPitch(pDst);
-
- int bpp = pDst->drawable.bitsPerPixel;
- int cpp = (bpp + 7) / 8;
- int wBytes = w * cpp;
-
- exaWaitSync(pDst->drawable.pScreen);
-
- dst += (x * cpp) + (y * dst_pitch);
-
- while (h--) {
- memcpy(dst, src, wBytes);
- src += src_pitch;
- dst += dst_pitch;
- }
-
- return TRUE;
-}
-
-/*
- * Memcpy-based DFS.
- */
-static Bool
-Mach64DownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
- char *dst, int dst_pitch)
-{
- char *src = pSrc->devPrivate.ptr;
- int src_pitch = exaGetPixmapPitch(pSrc);
-
- int bpp = pSrc->drawable.bitsPerPixel;
- int cpp = (bpp + 7) / 8;
- int wBytes = w * cpp;
-
- exaWaitSync(pSrc->drawable.pScreen);
-
- src += (x * cpp) + (y * src_pitch);
-
- while (h--) {
- memcpy(dst, src, wBytes);
- src += src_pitch;
- dst += dst_pitch;
- }
-
- return TRUE;
-}
-
#include "atimach64render.c"
/* Compute log base 2 of val. */
@@ -659,12 +605,6 @@ Bool ATIMach64ExaInit(ScreenPtr pScreen)
pExa->Copy = Mach64Copy;
pExa->DoneCopy = Mach64DoneCopy;
- /* EXA hits more optimized paths when it does not have to fallback because
- * of missing UTS/DFS, hook memcpy-based UTS/DFS.
- */
- pExa->UploadToScreen = Mach64UploadToScreen;
- pExa->DownloadFromScreen = Mach64DownloadFromScreen;
-
if (pATI->RenderAccelEnabled) {
if (pATI->Chip >= ATI_CHIP_264GTPRO) {
/* 3D Rage Pro does not support NPOT textures. */
commit f0d44c18d71e7450b99189c1221a2f89c7817ab6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Dec 6 16:49:12 2012 -0800
Mach64PixelARGB should use exaGetPixmapFirstPixel
Fixes crash attempting to read a pixel from a NULL pPixmap->devPrivate.ptr
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
diff --git a/src/atimach64render.c b/src/atimach64render.c
index 4862cd4..ffde2cb 100644
--- a/src/atimach64render.c
+++ b/src/atimach64render.c
@@ -209,22 +209,7 @@ Mach64PixelARGB(PixmapPtr pPixmap, CARD32 format, CARD32 *argb)
CARD8 comp;
int bits, shift;
- /* Ensure that texture drawing has completed. */
- exaWaitSync(pPixmap->drawable.pScreen);
-
- /* exaGetPixmapFirstPixel() */
-
- switch (pPixmap->drawable.bitsPerPixel) {
- case 32:
- pixel = *(CARD32 *)(pPixmap->devPrivate.ptr);
- break;
- case 16:
- pixel = *(CARD16 *)(pPixmap->devPrivate.ptr);
- break;
- default:
- pixel = *(CARD8 *)(pPixmap->devPrivate.ptr);
- break;
- }
+ pixel = exaGetPixmapFirstPixel(pPixmap);
/* exaGetRGBAFromPixel()/viaPixelARGB8888() */
commit 42c4e423eec789606eec9703be23a9fd4483a14a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 2 10:19:47 2012 -0400
Fix build with neither XAA nor EXA against xserver 1.13.0
Pull in picturestr.h to get GLYPH_HAS_GLYPH_PICTURE_ACCESSOR defined
before compat-api.h is parsed, otherwise you fail with:
In file included from /usr/include/xorg/picturestr.h:28:0,
from /usr/include/xorg/exa.h:38,
from atimach64accel.h:31,
from atiscreen.c:46:
/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '*' token
/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '(' token
/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '*' token
/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '(' token
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/atistruct.h b/src/atistruct.h
index 702360b..98dc15e 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -51,6 +51,7 @@
#endif /* TV_OUT */
+#include "picturestr.h"
#ifdef USE_EXA
#include "exa.h"
#endif
commit 104e3e067a7dcac143cb672fe42d56396ba6087b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 26 16:21:25 2012 -0400
Don't gratuitously disable Render when ShadowFBing
There's no reason to do this, and I am at a loss to explain why that was
ever done. The first instance of this logic comes from xfree86 (over 11
years ago!):
http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c.diff?r1=1.15&r2=1.16
Now, cfb never had Render support, so that might make some sense if
there was an intermediate uncommitted state where the driver used fb for
direct but cfb for shadowed. But that's really the only plausible
explanation I can think of.
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/atiscreen.c b/src/atiscreen.c
index b1fbd3c..62a4dd9 100644
--- a/src/atiscreen.c
+++ b/src/atiscreen.c
@@ -476,21 +476,11 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
}
}
- /* If applicable, initialise RENDER extension */
+ /* initialise RENDER extension */
+ if (!fbPictureInit(pScreen, NULL, 0) && (serverGeneration == 1))
{
- if (pATI->OptionShadowFB)
- {
- if (serverGeneration == 1)
- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
- "RENDER extension not supported with a shadowed"
- " framebuffer.\n");
- }
- else if (!fbPictureInit(pScreen, NULL, 0) &&
- (serverGeneration == 1))
- {
- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
- "RENDER extension initialisation failed.\n");
- }
+ xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
+ "RENDER extension initialisation failed.\n");
}
xf86SetBlackWhitePixels(pScreen);
commit d29293f0c99489cfdd9312f8797062755d383d83
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 16:50:35 2012 +0200
Add 01_fix_build.diff to build on new X
diff --git a/debian/changelog b/debian/changelog
index b66bfe9..5ad0c9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-mach64 (6.9.3-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.9.3
+ * Add 01_fix_build.diff to build on new X
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 18 Jul 2012 16:10:36 +0200
diff --git a/debian/patches/01_fix_build.diff b/debian/patches/01_fix_build.diff
new file mode 100644
index 0000000..22b1d3b
--- /dev/null
+++ b/debian/patches/01_fix_build.diff
@@ -0,0 +1,13 @@
+diff --git a/src/atiscreen.c b/src/atiscreen.c
+index 2957877..b1fbd3c 100644
+--- a/src/atiscreen.c
++++ b/src/atiscreen.c
+@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
+ #ifdef TV_OUT
+ /* Fix-up TV out after ImpacTV probe */
+ if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO)
+- ATISwitchMode(0, pScreenInfo->currentMode, 0);
++ ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, pScreenInfo->currentMode));
+ #endif /* TV_OUT */
+
+ #ifdef XF86DRI_DEVEL
diff --git a/debian/patches/series b/debian/patches/series
index fdffa2a..1f24f51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# placeholder
+01_fix_build.diff
commit 2ee176b81bbdbf4795637fa857d2f00425d0dbb2
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 16:12:05 2012 +0200
Reply to: