Hello community, here is the log from the commit of package xf86-video-mach64 for openSUSE:Factory checked in at 2012-09-23 08:10:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-mach64 (Old) and /work/SRC/openSUSE:Factory/.xf86-video-mach64.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-mach64", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-mach64/xf86-video-mach64.changes 2012-05-08 12:04:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-mach64.new/xf86-video-mach64.changes 2012-09-23 08:10:14.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Sep 18 14:01:40 UTC 2012 - [email protected] + +- U_mach64-fix-build-on-32-bit.patch + * fix build on 32-bit. tvout code only builds on 32-bit. + +------------------------------------------------------------------- +Mon Sep 17 19:42:18 UTC 2012 - [email protected] + +- Update to version 6.9.3 + * fix build against server without XAA + +------------------------------------------------------------------- Old: ---- xf86-video-mach64-6.9.1.tar.bz2 New: ---- U_mach64-fix-build-on-32-bit.patch xf86-video-mach64-6.9.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-mach64.spec ++++++ --- /var/tmp/diff_new_pack.OQ9J8S/_old 2012-09-23 08:10:17.000000000 +0200 +++ /var/tmp/diff_new_pack.OQ9J8S/_new 2012-09-23 08:10:17.000000000 +0200 @@ -15,14 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xf86-video-mach64 -Version: 6.9.1 +Version: 6.9.3 Release: 0 -License: MIT Summary: ATI Mach64 series video driver for the Xorg X server -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Servers/XF86_4 +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 +Patch0: U_mach64-fix-build-on-32-bit.patch BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -47,6 +49,7 @@ %prep %setup -q +%patch0 -p1 %build %configure ++++++ U_mach64-fix-build-on-32-bit.patch ++++++ >From 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c Mon Sep 17 00:00:00 2001 From: Dave Airlie <[email protected]> Date: Wed, 18 Jul 2012 18:46:49 +1000 Subject: [PATCH] mach64: fix build on 32-bit. tvout code only builds on 32-bit, fix build. Signed-off-by: Dave Airlie <[email protected]> --- src/atiscreen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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 -- 1.7.3.4 ++++++ xf86-video-mach64-6.9.1.tar.bz2 -> xf86-video-mach64-6.9.3.tar.bz2 ++++++ ++++ 26626 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/ChangeLog new/xf86-video-mach64-6.9.3/ChangeLog --- old/xf86-video-mach64-6.9.1/ChangeLog 2012-03-24 02:58:20.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/ChangeLog 2012-07-17 08:22:32.000000000 +0200 @@ -1,3 +1,60 @@ +commit 2776fc9cd69f18ba6f09f39ca747f3a9333bf9e4 +Author: Dave Airlie <[email protected]> +Date: Tue Jul 17 16:05:09 2012 +1000 + + xf86-video-mach64: bump to version 6.9.3 + + Signed-off-by: Dave Airlie <[email protected]> + +commit a2213da6d87baa8b5f49d3894513ced2c6974259 +Author: Dave Airlie <[email protected]> +Date: Mon Jul 16 04:29:53 2012 +0100 + + mach64: fix build against server without XAA + + Signed-off-by: Dave Airlie <[email protected]> + +commit 3fce61b475355820f735e50b7070ee6fc906083d +Author: Dave Airlie <[email protected]> +Date: Mon Jul 2 12:23:03 2012 +0100 + + mach64: bump to 6.9.2 + + Signed-off-by: Dave Airlie <[email protected]> + +commit 68572c1e41cf6de2f0ef2c9442111384ce863308 +Author: Dave Airlie <[email protected]> +Date: Wed Jun 6 10:42:26 2012 +0100 + + ati: only include deprecated file in one place. + + reduces warnings. + + Signed-off-by: Dave Airlie <[email protected]> + +commit a9f3a66e355b9f19c312d399771fb1d8eb2e046d +Author: Dave Airlie <[email protected]> +Date: Wed Jun 6 10:41:11 2012 +0100 + + mach64: port to new compat API. + + Signed-off-by: Dave Airlie <[email protected]> + +commit 84468ba28853fa57170025d9c25cb0029a386ff4 +Author: Alan Coopersmith <[email protected]> +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 <[email protected]> + commit 5e09e744b27b5ada9dd064e250fa98eddf1a58c3 Author: Alan Coopersmith <[email protected]> Date: Fri Mar 23 18:56:44 2012 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/README new/xf86-video-mach64-6.9.3/README --- old/xf86-video-mach64-6.9.1/README 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/README 2012-06-05 21:10:26.000000000 +0200 @@ -2,7 +2,7 @@ Marc Aurele La France 2002 February 12 - This is the README for the XAA ATI driver included in this release. + This is the README for the ATI Mach64 driver included in this release. ______________________________________________________________________ Table of Contents @@ -51,7 +51,7 @@ based on the Mach64 series or older chipsets, providing maximum video function within hardware limitations. The driver is also intended to optionally provide the same level of support for generic VGA or 8514/A - adapters. The newer Rage 128 and Radeon chips are not yet supported + adapters. The newer Rage 128 and Radeon chips are not supported by this driver. Rage 128's and Radeon's are, however, supported by separate drivers, and owners of such adapters should consult the documentation provided with these drivers. This driver will also @@ -130,7 +130,7 @@ VGA CRTC). - The newer Rage 128 and Radeon chips are not yet supported by this + The newer Rage 128 and Radeon chips are not supported by this driver. Rage 128's and Radeon's are, however, supported by separate drivers, and owners of such adapters should consult the documentation provided with these drivers. This driver will also invoke the @@ -754,7 +754,7 @@ If you are experiencing problems that are not already recorded in this document, first ensure that you have the latest current release of this driver and the Xorg X server. Check the server's log (usually - found in /var/log/Xorg.0.log) and ftp://ftp.freedesktop.org/pub/Xorg + found in /var/log/Xorg.0.log) and http://www.x.org/releases/individual/ if you are uncertain. Secondly, please check Xorg's doc directory for additional diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/config.h.in new/xf86-video-mach64-6.9.3/config.h.in --- old/xf86-video-mach64-6.9.1/config.h.in 2012-03-24 02:57:26.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/config.h.in 2012-07-17 08:22:32.000000000 +0200 @@ -38,6 +38,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the <xaa.h> header file. */ +#undef HAVE_XAA_H + /* xextproto 7.1 available */ #undef HAVE_XEXTPROTO_71 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/configure.ac new/xf86-video-mach64-6.9.3/configure.ac --- old/xf86-video-mach64-6.9.1/configure.ac 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/configure.ac 2012-07-17 08:00:16.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-mach64], - [6.9.1], + [6.9.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-mach64]) AC_CONFIG_SRCDIR([Makefile.am]) @@ -162,8 +162,6 @@ 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 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/missing new/xf86-video-mach64-6.9.3/missing --- old/xf86-video-mach64-6.9.1/missing 2012-03-24 02:57:27.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/missing 2012-06-05 21:11:37.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/Makefile.am new/xf86-video-mach64-6.9.3/src/Makefile.am --- old/xf86-video-mach64-6.9.1/src/Makefile.am 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/Makefile.am 2012-06-05 21:12:45.000000000 +0200 @@ -107,4 +107,5 @@ mach64_common.h \ mach64_dri.h \ mach64_sarea.h \ - atipcirename.h + atipcirename.h \ + compat-api.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/ati.h new/xf86-video-mach64-6.9.3/src/ati.h --- old/xf86-video-mach64-6.9.1/src/ati.h 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/ati.h 2012-06-06 11:41:33.000000000 +0200 @@ -25,7 +25,6 @@ #include <unistd.h> #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "xf86.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atiadjust.c new/xf86-video-mach64-6.9.3/src/atiadjust.c --- old/xf86-video-mach64-6.9.1/src/atiadjust.c 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atiadjust.c 2012-06-06 11:37:28.000000000 +0200 @@ -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 @@ * 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atiadjust.h new/xf86-video-mach64-6.9.3/src/atiadjust.h --- old/xf86-video-mach64-6.9.1/src/atiadjust.h 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atiadjust.h 2012-06-06 11:39:28.000000000 +0200 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/aticonsole.c new/xf86-video-mach64-6.9.3/src/aticonsole.c --- old/xf86-video-mach64-6.9.1/src/aticonsole.c 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/aticonsole.c 2012-06-06 11:36:01.000000000 +0200 @@ -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 @@ if (!pScreen) return TRUE; - pScreenInfo = xf86Screens[pScreen->myNum]; + pScreenInfo = xf86ScreenToScrn(pScreen); if (!pScreenInfo->vtSema) return TRUE; @@ -558,8 +558,8 @@ (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 @@ * 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 @@ * 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 @@ * 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 @@ * 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/aticonsole.h new/xf86-video-mach64-6.9.3/src/aticonsole.h --- old/xf86-video-mach64-6.9.1/src/aticonsole.h 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/aticonsole.h 2012-06-06 11:36:01.000000000 +0200 @@ -33,11 +33,11 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atidga.c new/xf86-video-mach64-6.9.3/src/atidga.c --- old/xf86-video-mach64-6.9.1/src/atidga.c 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atidga.c 2012-06-06 11:39:54.000000000 +0200 @@ -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 @@ { ATIPtr pATI = ATIPTR(pScreenInfo); DisplayModePtr pMode; - int iScreen = pScreenInfo->scrnIndex; int frameX0, frameY0; if (pDGAMode) @@ -128,11 +127,11 @@ 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 @@ int flags ) { - (*pScreenInfo->AdjustFrame)(pScreenInfo->pScreen->myNum, x, y, flags); + (*pScreenInfo->AdjustFrame)(ADJUST_FRAME_ARGS(pScreenInfo, x, y)); } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atidri.c new/xf86-video-mach64-6.9.3/src/atidri.c --- old/xf86-video-mach64-6.9.1/src/atidri.c 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atidri.c 2012-06-06 11:36:01.000000000 +0200 @@ -67,7 +67,7 @@ */ 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 ATIEnterServer( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); if ( pATI->directRenderingEnabled ) { @@ -336,7 +336,7 @@ #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 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 @@ #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 @@ { #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 @@ { #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 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 ATIDRISetAgpMode( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -791,7 +791,7 @@ */ static Bool ATIDRIAgpInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -961,7 +961,7 @@ static Bool ATIDRIPciInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -1013,7 +1013,7 @@ */ static Bool ATIDRIMapInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -1036,7 +1036,7 @@ /* Initialize the kernel data structures. */ static Bool ATIDRIKernelInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; drmMach64Init info; @@ -1077,7 +1077,7 @@ */ static Bool ATIDRIAddBuffers( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -1109,7 +1109,7 @@ static Bool ATIDRIMapBuffers( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -1129,7 +1129,7 @@ static Bool ATIDRIIrqInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); if ( pATI->irq <= 0 ) { @@ -1173,7 +1173,7 @@ */ Bool ATIDRIScreenInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); DRIInfoPtr pDRIInfo; ATIDRIPtr pATIDRI; @@ -1445,7 +1445,7 @@ */ Bool ATIDRIFinishScreenInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATISAREAPrivPtr pSAREAPriv; ATIDRIPtr pATIDRI; @@ -1538,7 +1538,7 @@ */ void ATIDRIResume( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -1558,7 +1558,7 @@ */ void ATIDRICloseScreen( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; drmMach64Init info; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atimach64accel.c new/xf86-video-mach64-6.9.3/src/atimach64accel.c --- old/xf86-video-mach64-6.9.1/src/atimach64accel.c 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atimach64accel.c 2012-06-06 11:36:01.000000000 +0200 @@ -976,7 +976,7 @@ ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); XAAInfoRecPtr pXAAInfo; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atimach64accel.h new/xf86-video-mach64-6.9.3/src/atimach64accel.h --- old/xf86-video-mach64-6.9.1/src/atimach64accel.h 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atimach64accel.h 2012-07-16 05:29:06.000000000 +0200 @@ -25,7 +25,9 @@ #include "atipriv.h" +#ifdef HAVE_XAA_H #include "xaa.h" +#endif #include "exa.h" #define ATIMach64MaxX 4095 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atimach64cursor.c new/xf86-video-mach64-6.9.3/src/atimach64cursor.c --- old/xf86-video-mach64-6.9.1/src/atimach64cursor.c 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atimach64cursor.c 2012-06-06 11:36:01.000000000 +0200 @@ -346,7 +346,7 @@ CursorPtr pCursor ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); if (!pATI->CursorBase) @@ -367,7 +367,7 @@ ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); xf86CursorInfoPtr pCursorInfo; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atimach64exa.c new/xf86-video-mach64-6.9.3/src/atimach64exa.c --- old/xf86-video-mach64-6.9.1/src/atimach64exa.c 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atimach64exa.c 2012-06-06 11:36:01.000000000 +0200 @@ -108,7 +108,7 @@ static void Mach64WaitMarker(ScreenPtr pScreenInfo, int Marker) { - ATIMach64Sync(xf86Screens[pScreenInfo->myNum]); + ATIMach64Sync(xf86ScreenToScrn(pScreenInfo)); } static Bool @@ -159,7 +159,7 @@ unsigned int offset, unsigned int pitch) { #if 0 - ScrnInfoPtr pScreenInfo = xf86Screens[pPix->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pPix->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); if (pitch % pATI->pExa->pixmapPitchAlign != 0) @@ -207,7 +207,7 @@ Pixel planemask ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pDstPixmap->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pDstPixmap->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); CARD32 src_pitch_offset, dst_pitch_offset, dp_pix_width; @@ -259,7 +259,7 @@ int h ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pDstPixmap->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pDstPixmap->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); srcX *= pATI->XModifier; @@ -319,7 +319,7 @@ Pixel fg ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pPixmap->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pPixmap->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); CARD32 dst_pitch_offset, dp_pix_width; @@ -358,7 +358,7 @@ int y2 ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pPixmap->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pPixmap->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); int x = x1; @@ -468,7 +468,7 @@ static void Mach64SetupMemEXA(ScreenPtr pScreen) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); int cpp = (pScreenInfo->bitsPerPixel + 7) / 8; @@ -634,7 +634,7 @@ Bool ATIMach64ExaInit(ScreenPtr pScreen) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ExaDriverPtr pExa; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atimach64probe.c new/xf86-video-mach64-6.9.3/src/atimach64probe.c --- old/xf86-video-mach64-6.9.1/src/atimach64probe.c 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atimach64probe.c 2012-06-06 11:42:14.000000000 +0200 @@ -38,6 +38,8 @@ #include "atiadjust.h" #include "ativalid.h" +#include "xf86PciInfo.h" + #ifndef XSERVER_LIBPCIACCESS static Bool Mach64Probe(DriverPtr pDriver, int flags); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atimach64render.c new/xf86-video-mach64-6.9.3/src/atimach64render.c --- old/xf86-video-mach64-6.9.1/src/atimach64render.c 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atimach64render.c 2012-06-06 11:36:01.000000000 +0200 @@ -583,7 +583,7 @@ static Bool Mach64PrepareTexture(PicturePtr pPict, PixmapPtr pPix) { - ScrnInfoPtr pScreenInfo = xf86Screens[pPix->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pPix->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); Mach64ContextRegs3D *m3d = &pATI->m3d; @@ -671,7 +671,7 @@ PixmapPtr pDst ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pDst->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pDst->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); Mach64ContextRegs3D *m3d = &pATI->m3d; @@ -818,7 +818,7 @@ int h ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pDst->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pDst->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); Mach64ContextRegs3D *m3d = &pATI->m3d; @@ -895,7 +895,7 @@ void Mach64DoneComposite(PixmapPtr pDst) { - ScrnInfoPtr pScreenInfo = xf86Screens[pDst->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pDst->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRISync(pScreenInfo); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atimach64xv.c new/xf86-video-mach64-6.9.3/src/atimach64xv.c --- old/xf86-video-mach64-6.9.1/src/atimach64xv.c 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atimach64xv.c 2012-06-06 11:36:01.000000000 +0200 @@ -524,7 +524,7 @@ FBLinearPtr pLinear ) { - ATIPtr pATI = ATIPTR(xf86Screens[pLinear->pScreen->myNum]); + ATIPtr pATI = ATIPTR(xf86ScreenToScrn(pLinear->pScreen)); pATI->pXVBuffer = NULL; outf(OVERLAY_SCALE_CNTL, SCALE_EN); @@ -1349,7 +1349,7 @@ XF86VideoAdaptorPtr **pppAdaptor ) { - ScreenPtr pScreen = screenInfo.screens[pScreenInfo->scrnIndex]; + ScreenPtr pScreen = xf86ScrnToScreen(pScreenInfo); ATIPtr pATI = ATIPTR(pScreenInfo); XF86VideoAdaptorPtr *ppAdaptor = NULL; XF86VideoAdaptorPtr pAdaptor; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atipreinit.c new/xf86-video-mach64-6.9.3/src/atipreinit.c --- old/xf86-video-mach64-6.9.1/src/atipreinit.c 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atipreinit.c 2012-06-06 11:37:45.000000000 +0200 @@ -28,7 +28,6 @@ #include <stdio.h> #include "ati.h" -#include "atiadjust.h" #include "atiaudio.h" #include "atibus.h" #include "atichip.h" @@ -50,6 +49,7 @@ #include "atividmem.h" #include "atiwonderio.h" #include "atixv.h" +#include "atiadjust.h" #include "vbe.h" #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atiscreen.c new/xf86-video-mach64-6.9.3/src/atiscreen.c --- old/xf86-video-mach64-6.9.1/src/atiscreen.c 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atiscreen.c 2012-06-06 11:36:01.000000000 +0200 @@ -34,17 +34,17 @@ #include "ati.h" #include "atibus.h" #include "atichip.h" -#include "aticonsole.h" #include "aticursor.h" #include "atidac.h" #include "atidga.h" #include "atidri.h" #include "atimach64.h" #include "atimode.h" -#include "atiscreen.h" #include "atistruct.h" +#include "atiscreen.h" #include "atixv.h" #include "atimach64accel.h" +#include "aticonsole.h" #ifdef XF86DRI_DEVEL #include "mach64_dri.h" @@ -124,11 +124,10 @@ static Bool ATIMach64SetupMemXAA_NoDRI ( - int iScreen, + ScrnInfoPtr pScreenInfo, ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; ATIPtr pATI = ATIPTR(pScreenInfo); int maxScanlines = ATIMach64MaxY; @@ -166,11 +165,10 @@ static Bool ATIMach64SetupMemXAA ( - int iScreen, + ScrnInfoPtr pScreenInfo, ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -276,7 +274,7 @@ if (scanlines > ATIMach64MaxY) scanlines = ATIMach64MaxY; if ( pATIDRIServer->IsPCI && pATIDRIServer->textureSize == 0 ) { - xf86DrvMsg(iScreen, X_WARNING, + xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, "Not enough memory for local textures, disabling DRI\n"); ATIDRICloseScreen(pScreen); pATI->directRenderingEnabled = FALSE; @@ -322,13 +320,13 @@ } - xf86DrvMsg(iScreen, X_INFO, "Will use %d kB of offscreen memory for XAA\n", + xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, "Will use %d kB of offscreen memory for XAA\n", (offscreenBytes - pATIDRIServer->textureSize)/1024); - xf86DrvMsg(iScreen, X_INFO, "Will use back buffer at offset 0x%x\n", + xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, "Will use back buffer at offset 0x%x\n", pATIDRIServer->backOffset); - xf86DrvMsg(iScreen, X_INFO, "Will use depth buffer at offset 0x%x\n", + xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, "Will use depth buffer at offset 0x%x\n", pATIDRIServer->depthOffset); if (pATIDRIServer->textureSize > 0) { @@ -350,15 +348,9 @@ * This function is called by DIX to initialise the screen. */ Bool -ATIScreenInit -( - int iScreen, - ScreenPtr pScreen, - int argc, - char **argv -) +ATIScreenInit(SCREEN_INIT_ARGS_DECL) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); pointer pFB; int VisualMask; @@ -411,7 +403,7 @@ * 3D triangle setup (the VERTEX_* registers) */ if (pATI->Chip < ATI_CHIP_264GTPRO) { - xf86DrvMsg(iScreen, X_WARNING, + xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, "Direct rendering is not supported for ATI chips earlier than " "the ATI 3D Rage Pro.\n"); pATI->directRenderingEnabled = FALSE; @@ -428,13 +420,13 @@ + (pScreenInfo->virtualY * 2 / cpp); /* depth buffer (always 16-bit) */ if (!pATI->OptionAccel) { - xf86DrvMsg(iScreen, X_WARNING, + xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, "Acceleration disabled, not initializing the DRI\n"); pATI->directRenderingEnabled = FALSE; } else if ( maxY > requiredY ) { pATI->directRenderingEnabled = ATIDRIScreenInit(pScreen); } else { - xf86DrvMsg(iScreen, X_WARNING, + xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, "DRI static buffer allocation failed -- " "need at least %d kB video memory\n", (pScreenInfo->displayWidth * requiredY * cpp ) / 1024); @@ -512,13 +504,13 @@ #ifdef XF86DRI_DEVEL if (pATI->directRenderingEnabled) { - if (!ATIMach64SetupMemXAA(iScreen, pScreen)) + if (!ATIMach64SetupMemXAA(pScreenInfo, pScreen)) return FALSE; } else #endif /* XF86DRI_DEVEL */ { - if (!ATIMach64SetupMemXAA_NoDRI(iScreen, pScreen)) + if (!ATIMach64SetupMemXAA_NoDRI(pScreenInfo, pScreen)) return FALSE; } @@ -620,13 +612,9 @@ * This function is called by DIX to close the screen. */ Bool -ATICloseScreen -( - int iScreen, - ScreenPtr pScreen -) +ATICloseScreen (CLOSE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); #ifdef XF86DRI_DEVEL @@ -680,5 +668,5 @@ pScreenInfo->pScreen = NULL; pScreen->CloseScreen = pATI->CloseScreen; - return (*pScreen->CloseScreen)(iScreen, pScreen); + return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atiscreen.h new/xf86-video-mach64-6.9.3/src/atiscreen.h --- old/xf86-video-mach64-6.9.1/src/atiscreen.h 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atiscreen.h 2012-06-06 11:36:01.000000000 +0200 @@ -25,7 +25,7 @@ #include "screenint.h" -extern Bool ATIScreenInit(int, ScreenPtr, int, char **); -extern Bool ATICloseScreen(int, ScreenPtr); +extern Bool ATIScreenInit(SCREEN_INIT_ARGS_DECL); +extern Bool ATICloseScreen(CLOSE_SCREEN_ARGS_DECL); #endif /* ___ATISCREEN_H___ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/atistruct.h new/xf86-video-mach64-6.9.3/src/atistruct.h --- old/xf86-video-mach64-6.9.1/src/atistruct.h 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/atistruct.h 2012-06-06 11:36:01.000000000 +0200 @@ -65,6 +65,8 @@ #include "atipcirename.h" +#include "compat-api.h" + #define CacheSlotOf(____Register) ((____Register) / UnitOf(DWORD_SELECT)) /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/ativalid.c new/xf86-video-mach64-6.9.3/src/ativalid.c --- old/xf86-video-mach64-6.9.1/src/ativalid.c 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/ativalid.c 2012-06-06 11:39:16.000000000 +0200 @@ -24,11 +24,11 @@ #include "config.h" #endif +#include "xf86.h" #include "atichip.h" #include "atistruct.h" #include "ativalid.h" -#include "xf86.h" /* * ATIValidMode -- @@ -38,13 +38,13 @@ ModeStatus ATIValidMode ( - int iScreen, + SCRN_ARG_TYPE arg, DisplayModePtr pMode, Bool Verbose, int flags ) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; + SCRN_INFO_PTR(arg); ATIPtr pATI = ATIPTR(pScreenInfo); int HBlankWidth, HAdjust, VScan, VInterlace; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/ativalid.h new/xf86-video-mach64-6.9.3/src/ativalid.h --- old/xf86-video-mach64-6.9.1/src/ativalid.h 2012-03-24 02:57:19.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/ativalid.h 2012-06-06 11:38:34.000000000 +0200 @@ -25,6 +25,6 @@ #include "xf86str.h" -extern ModeStatus ATIValidMode(int, DisplayModePtr, Bool, int); +extern ModeStatus ATIValidMode(SCRN_ARG_TYPE arg, DisplayModePtr, Bool, int); #endif /* ___ATIVALID_H___ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.1/src/compat-api.h new/xf86-video-mach64-6.9.3/src/compat-api.h --- old/xf86-video-mach64-6.9.1/src/compat-api.h 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-video-mach64-6.9.3/src/compat-api.h 2012-06-06 11:36:01.000000000 +0200 @@ -0,0 +1,101 @@ +/* + * Copyright 2012 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Dave Airlie <[email protected]> + */ + +/* this file provides API compat between server post 1.13 and pre it, + it should be reused inside as many drivers as possible */ +#ifndef COMPAT_API_H +#define COMPAT_API_H + +#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR +#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] +#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p +#endif + +#ifndef XF86_HAS_SCRN_CONV +#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] +#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] +#endif + +#ifndef XF86_SCRN_INTERFACE + +#define SCRN_ARG_TYPE int +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScreenInfo = xf86Screens[(arg1)] + +#define SCREEN_ARG_TYPE int +#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] + +#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask + +#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen +#define CLOSE_SCREEN_ARGS scrnIndex, pScreen + +#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags +#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 + +#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr pMode, int flags +#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 + +#define FREE_SCREEN_ARGS_DECL int arg, int flags + +#define VT_FUNC_ARGS_DECL int arg, int flags +#define VT_FUNC_ARGS pScreenInfo->scrnIndex, 0 + +#define XF86_SCRN_ARG(x) ((x)->scrnIndex) +#define SCREEN_ARG(x) ((x)->myNum) +#else +#define SCRN_ARG_TYPE ScrnInfoPtr +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScreenInfo = (arg1) + +#define SCREEN_ARG_TYPE ScreenPtr +#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) + +#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + +#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen +#define CLOSE_SCREEN_ARGS pScreen + +#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y +#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y + +#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr pMode +#define SWITCH_MODE_ARGS(arg, m) arg, m + +#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg + +#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg +#define VT_FUNC_ARGS pScreenInfo + +#define XF86_SCRN_ARG(x) (x) + +#define SCREEN_ARG(x) (x) +#endif + +#endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
