ChangeLog | 1544 +++++++++++++++++++++++++++++++++-
config.guess | 32
config.sub | 28
configure | 20
configure.ac | 2
debian/changelog | 10
debian/patches/02_radeon_manpage.diff | 6
src/atiaccel.c | 121 --
src/atiaccel.h | 36
src/atiadapter.c | 58 -
src/atiadapter.h | 60 -
src/aticursor.c | 79 -
src/atiio.h | 83 -
src/atimach64cursor.h | 31
src/atimach64xv.h | 37
src/atimono.h | 43
src/atixv.c | 169 ---
src/radeon_bios.c | 5
src/radeon_display.c | 65 -
src/radeon_driver.c | 137 +--
src/radeon_mergedfb.c | 53 -
src/radeon_modes.c | 82 -
src/radeon_probe.h | 3
src/radeon_reg.h | 2
24 files changed, 1795 insertions(+), 911 deletions(-)
New commits:
commit fe8aaca8a08efba9e7bff6f58c8d739a1610d17e
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon May 21 02:22:53 2007 +0200
Fix typo in changelog.
diff --git a/debian/changelog b/debian/changelog
index 4ceed89..04ab651 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ xserver-xorg-video-ati (1:6.6.192-1) experimental; urgency=low
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
* Add XS-Vcs-*.
- * Add a link to www.X.org and a reference to the xf86-video-tga
+ * Add a link to www.X.org and a reference to the xf86-video-ati
module in the long description (closes: #425321).
[ Timo Aaltonen ]
commit 66b5a1805b9d161fc3c73e2819e06b78cc4f0d83
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon May 21 01:28:55 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index f22b39a..4ceed89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ati (1:6.6.192-1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.6.192-1) experimental; urgency=low
[ Brice Goglin ]
* Build a xserver-xorg-video-ati-dbg package with debugging symbols.
@@ -18,7 +18,7 @@ xserver-xorg-video-ati (1:6.6.192-1) UNRELEASED; urgency=low
* New upstream release candidate
* Refresh patch 02_radeon_manpage.diff.
- -- Julien Cristau <[EMAIL PROTECTED]> Mon, 21 May 2007 01:02:30 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Mon, 21 May 2007 01:28:33 +0200
xserver-xorg-video-ati (1:6.6.191-1) experimental; urgency=low
commit b00ad30529e728bdc1bf92eaa9840103e5170df2
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon May 21 01:26:32 2007 +0200
Delete obsolete files.
diff --git a/src/atiaccel.c b/src/atiaccel.c
deleted file mode 100644
index 99efae9..0000000
--- a/src/atiaccel.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiaccel.c,v 1.13
2003/04/24 21:19:22 tsi Exp $ */
-/*
- * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), [EMAIL
PROTECTED]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * DRI support by:
- * Leif Delgass <[EMAIL PROTECTED]>
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "atiaccel.h"
-#include "atiadapter.h"
-#include "atimach64accel.h"
-#include "atistruct.h"
-
-#ifdef USE_XAA
-/*
- * ATIInitializeAcceleration --
- *
- * This function is called to initialise both the framebuffer manager and XAA
- * on a screen.
- */
-Bool
-ATIInitializeAcceleration
-(
- ScreenPtr pScreen,
- ScrnInfoPtr pScreenInfo,
- ATIPtr pATI
-)
-{
- if (pATI->OptionAccel)
- {
- if (!(pATI->pXAAInfo = XAACreateInfoRec()))
- return FALSE;
-
- switch (pATI->Adapter)
- {
- case ATI_ADAPTER_MACH64:
- ATIMach64AccelInit(pATI, pATI->pXAAInfo);
- break;
-
- default:
- break;
- }
- }
-
- if (!pATI->OptionAccel || XAAInit(pScreen, pATI->pXAAInfo))
- return TRUE;
-
- XAADestroyInfoRec(pATI->pXAAInfo);
- pATI->pXAAInfo = NULL;
- return FALSE;
-}
-
-FBLinearPtr
-ATIResizeOffscreenLinear
-(
- ScreenPtr pScreen,
- FBLinearPtr pLinear,
- int Size
-)
-{
- if (Size <= 0)
- {
- xf86FreeOffscreenLinear(pLinear);
- return NULL;
- }
-
- if (pLinear)
- {
- if ((pLinear->size >= Size) ||
- xf86ResizeOffscreenLinear(pLinear, Size))
- {
- pLinear->MoveLinearCallback = NULL;
- pLinear->RemoveLinearCallback = NULL;
- return pLinear;
- }
-
- xf86FreeOffscreenLinear(pLinear);
- }
-
- pLinear = xf86AllocateOffscreenLinear(pScreen, Size, 16, NULL, NULL, NULL);
-
- if (!pLinear)
- {
- int maxSize;
-
- xf86QueryLargestOffscreenLinear(pScreen, &maxSize, 16,
- PRIORITY_EXTREME);
-
- if (maxSize < Size)
- return NULL;
-
- xf86PurgeUnlockedOffscreenAreas(pScreen);
- pLinear =
- xf86AllocateOffscreenLinear(pScreen, Size, 16, NULL, NULL, NULL);
- }
-
- return pLinear;
-}
-#endif /* USE_XAA */
diff --git a/src/atiaccel.h b/src/atiaccel.h
deleted file mode 100644
index 68fb607..0000000
--- a/src/atiaccel.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiaccel.h,v 1.5
2003/04/23 21:51:27 tsi Exp $ */
-/*
- * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), [EMAIL
PROTECTED]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef ___ATIACCEL_H___
-#define ___ATIACCEL_H___ 1
-
-#include "atipriv.h"
-
-#include "xf86str.h"
-#include "xf86fbman.h"
-
-extern Bool ATIInitializeAcceleration(ScreenPtr, ScrnInfoPtr, ATIPtr);
-
-extern FBLinearPtr ATIResizeOffscreenLinear(ScreenPtr, FBLinearPtr, int);
-
-#endif /* ___ATIACCEL_H___ */
diff --git a/src/atiadapter.c b/src/atiadapter.c
deleted file mode 100644
index 7dab08a..0000000
--- a/src/atiadapter.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadapter.c,v 1.17
2003/01/01 19:16:30 tsi Exp $ */
-/*
- * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), [EMAIL
PROTECTED]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "atiadapter.h"
-
-/*
- * Adapter-related definitions.
- */
-const char *ATIAdapterNames[] =
-{
- "Unknown",
-
-#ifndef AVOID_CPIO
-
- "ATI EGA Wonder800",
- "ATI EGA Wonder800+",
- "IBM VGA or compatible",
- "ATI VGA Basic16",
- "ATI VGA Wonder V3",
- "ATI VGA Wonder V4",
- "ATI VGA Wonder V5",
- "ATI VGA Wonder+",
- "ATI VGA Wonder XL or XL24",
- "ATI VGA Wonder VLB or PCI",
- "IBM 8514/A or compatible",
- "ATI Mach8",
- "ATI Mach32",
-
-#endif /* AVOID_CPIO */
-
- "ATI Mach64",
- "ATI Rage128",
- "ATI Radeon"
-};
diff --git a/src/atiadapter.h b/src/atiadapter.h
deleted file mode 100644
index 8db366e..0000000
--- a/src/atiadapter.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadapter.h,v 1.10
2003/01/01 19:16:30 tsi Exp $ */
-/*
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), [EMAIL
PROTECTED]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef ___ATIADAPTER_H___
-#define ___ATIADAPTER_H___ 1
-
-/*
- * Adapter-related definitions.
- */
-typedef enum
-{
- ATI_ADAPTER_NONE = 0,
-
-#ifndef AVOID_CPIO
-
- ATI_ADAPTER_EGA,
- ATI_ADAPTER_EGA_PLUS,
- ATI_ADAPTER_VGA,
- ATI_ADAPTER_BASIC,
- ATI_ADAPTER_V3,
- ATI_ADAPTER_V4,
- ATI_ADAPTER_V5,
- ATI_ADAPTER_PLUS,
- ATI_ADAPTER_XL,
- ATI_ADAPTER_NONISA,
- ATI_ADAPTER_8514A,
- ATI_ADAPTER_MACH8,
- ATI_ADAPTER_MACH32,
-
-#endif /* AVOID_CPIO */
-
- ATI_ADAPTER_MACH64,
- ATI_ADAPTER_RAGE128,
- ATI_ADAPTER_RADEON,
- ATI_ADAPTER_MAX /* Must be last */
-} ATIAdapterType;
-
-extern const char *ATIAdapterNames[];
-
-#endif /* ___ATIADAPTER_H___ */
diff --git a/src/aticursor.c b/src/aticursor.c
deleted file mode 100644
index 0dfc9ac..0000000
--- a/src/aticursor.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/aticursor.c,v 1.4
2003/04/23 21:51:27 tsi Exp $ */
-/*
- * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), [EMAIL
PROTECTED]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "atiadapter.h"
-#include "aticursor.h"
-#include "atimach64cursor.h"
-#include "atistruct.h"
-
-#include "xf86.h"
-
-/*
- * ATIInitializeCursor --
- *
- * This function initialises the screen cursor.
- */
-Bool
-ATIInitializeCursor
-(
- ScreenPtr pScreen,
- ATIPtr pATI
-)
-{
- /* Initialise software cursor */
- if (!miDCInitialize(pScreen, xf86GetPointerScreenFuncs()))
- return FALSE;
-
- if (pATI->Cursor == ATI_CURSOR_SOFTWARE)
- return TRUE;
-
- if (!(pATI->pCursorInfo = xf86CreateCursorInfoRec()))
- return FALSE;
-
- switch (pATI->Adapter)
- {
- case ATI_ADAPTER_MACH64:
- if (ATIMach64CursorInit(pATI->pCursorInfo))
- break;
- /* Fall through */
-
- default:
- xf86DestroyCursorInfoRec(pATI->pCursorInfo);
- pATI->pCursorInfo = NULL;
- return FALSE;
- }
-
- if (xf86InitCursor(pScreen, pATI->pCursorInfo))
- {
- xf86SetSilkenMouse(pScreen);
- return TRUE;
- }
-
- xf86DestroyCursorInfoRec(pATI->pCursorInfo);
- pATI->pCursorInfo = NULL;
- return FALSE;
-}
diff --git a/src/atiio.h b/src/atiio.h
deleted file mode 100644
index f6f871b..0000000
--- a/src/atiio.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiio.h,v 1.14
2003/01/01 19:16:32 tsi Exp $ */
-/*
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), [EMAIL
PROTECTED]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef ___ATIIO_H___
-
-#if !defined(___ATI_H___) && defined(XFree86Module)
-# error missing #include "ati.h" before #include "atiio.h"
-# undef XFree86Module
-#endif
-
-#define ___ATIIO_H___ 1
-
-#include "atiregs.h"
-
-#include "compiler.h"
-
-/* I/O decoding definitions */
-typedef enum
-{
- SPARSE_IO,
- BLOCK_IO
-} ATIIODecodingType;
-
-#ifndef AVOID_CPIO
-
-/* Wait until "n" queue entries are free */
-#define ibm8514WaitQueue(_n) \
- { \
- while (inw(GP_STAT) & (0x0100U >> (_n))); \
- }
-#define ATIWaitQueue(_n) \
- { \
- while (inw(EXT_FIFO_STATUS) & (0x010000U >> (_n))); \
- }
-
-/* Wait until GP is idle and queue is empty */
-#define WaitIdleEmpty() \
- { \
- while (inw(GP_STAT) & (GPBUSY | 1)); \
- }
-#define ProbeWaitIdleEmpty() \
- { \
- int _i; \
- CARD16 _value; \
- for (_i = 0; _i < 100000; _i++) \
- { \
- _value = inw(GP_STAT); \
- if (_value == (CARD16)(-1)) \
- break; \
- if (!(_value & (GPBUSY | 1))) \
- break; \
- } \
- }
-
-/* Wait until GP has data available */
-#define WaitDataReady() \
- { \
- while (!(inw(GP_STAT) & DATARDY)); \
- }
-
-#endif /* AVOID_CPIO */
-
-#endif /* ___ATIIO_H___ */
diff --git a/src/atimach64cursor.h b/src/atimach64cursor.h
deleted file mode 100644
index dcea5ca..0000000
--- a/src/atimach64cursor.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64cursor.h,v
1.1 2003/04/23 21:51:29 tsi Exp $ */
-/*
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [EMAIL
PROTECTED]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef ___ATIMACH64CURSOR_H___
-#define ___ATIMACH64CURSOR_H___ 1
-
-#include "xf86Cursor.h"
-
-extern Bool ATIMach64CursorInit(xf86CursorInfoPtr);
-
-#endif /* ___ATIMACH64CURSOR_H___ */
diff --git a/src/atimach64xv.h b/src/atimach64xv.h
deleted file mode 100644
index 8f5257c..0000000
--- a/src/atimach64xv.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64xv.h,v 1.1
2003/04/23 21:51:29 tsi Exp $ */
-/*
- * Copyright 2003 through 2004 by Marc Aurele La France (TSI @ UQV), [EMAIL
PROTECTED]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef ___ATIMACH64XV_H___
-#define ___ATIMACH64XV_H___ 1
-
-#include "atipriv.h"
-
-#include "xf86str.h"
-#include "xf86xv.h"
-
-extern int ATIMach64XVInitialiseAdaptor(ScreenPtr, ScrnInfoPtr, ATIPtr,
- XF86VideoAdaptorPtr **);
-
-extern void ATIMach64CloseXVideo(ScreenPtr, ScrnInfoPtr, ATIPtr);
-
-#endif /* ___ATIMACH64XV_H___ */
diff --git a/src/atimono.h b/src/atimono.h
deleted file mode 100644
index 6325cbe..0000000
--- a/src/atimono.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimono.h,v 1.7
2003/01/01 19:16:33 tsi Exp $ */
-/*
- * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), [EMAIL
PROTECTED]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef ___ATIMONO_H___
-#define ___ATIMONO_H___ 1
-
-#ifndef BIT_PLANE
-# define BIT_PLANE 3
-#endif
-
-#ifndef MONO_BLACK
-# define MONO_BLACK 0x00U
-#endif
-
-#ifndef MONO_WHITE
-# define MONO_WHITE 0x3FU
-#endif
-
-#ifndef MONO_OVERSCAN
-# define MONO_OVERSCAN 0x01U
-#endif
-
-#endif /* ___ATIMONO_H___ */
diff --git a/src/atixv.c b/src/atixv.c
deleted file mode 100644
index 0c59dad..0000000
--- a/src/atixv.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atixv.c,v 1.5
2003/04/25 04:09:54 tsi Exp $ */
-/*
- * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), [EMAIL
PROTECTED]
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of Marc Aurele La France not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. Marc Aurele La France makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as-is" without express or implied warranty.
- *
- * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
- * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "atiadapter.h"
-#include "atimach64xv.h"
-#include "atistruct.h"
-#include "atixv.h"
-
-/*
- * ATIXVFreeAdaptorInfo --
- *
- * Free XVideo adaptor information.
- */
-static void
-ATIXVFreeAdaptorInfo
-(
- XF86VideoAdaptorPtr *ppAdaptor,
- int nAdaptor
-)
-{
- if (!ppAdaptor)
- return;
-
- while (nAdaptor > 0)
- xfree(ppAdaptor[--nAdaptor]);
-
- xfree(ppAdaptor);
-}
-
-/*
- * ATIXVInitializeAdaptor --
- *
- * This is called by the server's XVideo support layer to initialise an XVideo
- * adapter.
- */
-static int
-ATIXVInitializeAdaptor
-(
- ScrnInfoPtr pScreenInfo,
- XF86VideoAdaptorPtr **pppAdaptor
-)
-{
- ScreenPtr pScreen =
screenInfo.screens[pScreenInfo->scrnIndex];
- ATIPtr pATI = ATIPTR(pScreenInfo);
- XF86VideoAdaptorPtr *ppAdaptor = NULL;
- int nAdaptor;
-
- switch (pATI->Adapter)
- {
- case ATI_ADAPTER_MACH64:
- nAdaptor = ATIMach64XVInitialiseAdaptor(pScreen, pScreenInfo, pATI,
- &ppAdaptor);
- break;
-
- default:
- nAdaptor = 0;
- break;
- }
-
- if (pppAdaptor)
- *pppAdaptor = ppAdaptor;
- else
- ATIXVFreeAdaptorInfo(ppAdaptor, nAdaptor);
-
- return nAdaptor;
-}
-
-/*
- * ATIXVPreInit --
- *
- * This function is called by ATIPreInit() to set up the environment required
- * to support the XVideo extension.
- */
-void
-ATIXVPreInit
-(
- ATIPtr pATI
-)
-{
-
-#ifndef AVOID_CPIO
-
- /* Currently a linear aperture is needed ... */
- if (!pATI->LinearBase)
- return;
-
-#endif /* AVOID_CPIO */
-
- (void)xf86XVRegisterGenericAdaptorDriver(ATIXVInitializeAdaptor);
-}
-
-/*
- * ATIInitializeXVideo --
- *
- * This function is called to initialise XVideo extension support on a screen.
- */
-Bool
-ATIInitializeXVideo
-(
- ScreenPtr pScreen,
- ScrnInfoPtr pScreenInfo,
- ATIPtr pATI
-)
-{
- XF86VideoAdaptorPtr *ppAdaptor;
- int nAdaptor;
- Bool result;
-
- if (!(pScreenInfo->memPhysBase = pATI->LinearBase))
- return FALSE;
-
- pScreenInfo->fbOffset = 0;
-
- nAdaptor = xf86XVListGenericAdaptors(pScreenInfo, &ppAdaptor);
- result = xf86XVScreenInit(pScreen, ppAdaptor, nAdaptor);
-
- ATIXVFreeAdaptorInfo(ppAdaptor, nAdaptor);
-
- return result;
-}
-
-/*
- * ATICloseXVideo --
- *
- * This function is called during screen termination to clean up after XVideo
- * initialisation.
- */
-void
-ATICloseXVideo
-(
- ScreenPtr pScreen,
- ScrnInfoPtr pScreenInfo,
- ATIPtr pATI
-)
-{
- switch (pATI->Adapter)
- {
- case ATI_ADAPTER_MACH64:
- ATIMach64CloseXVideo(pScreen, pScreenInfo, pATI);
- break;
-
- default:
- break;
- }
-}
commit 1e8cf3b2d4cce9c2d8adf042bcf21694205e1c97
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Mon May 21 01:18:13 2007 +0200
Update upstream changelog.
diff --git a/ChangeLog b/ChangeLog
index b408166..0dafab0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,44 +1,1432 @@
-commit 7be2dce975d60d68dd962d4928b2971cd9e011af
+commit 09bfc8ed000f95ede5b73f2bad69edc1a4d9bac6
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Sun May 20 18:06:22 2007 -0400
+
+ update to 6.6.192 for rc release
+
+commit 764cb73e8dec4040cdd418d249fc504399fca3ee
+Author: Alex Deucher <[EMAIL PROTECTED]>
+Date: Sun May 20 17:26:26 2007 -0400
+
+ Fix regular/"xinerama"/zaphod dualhead mode
+
+ - logic in RADEONUnblank() was wrong
+ - Calling RADEONSetupConnectors() on second instance screwed up the port
info
+ - still seem to be HW cursor issues with zaphod mode
+
+commit a3ee42207aab77d93655a82fdcb32be38268b85f
Author: Dave Airlie <[EMAIL PROTECTED]>
-Date: Wed Oct 4 01:01:48 2006 +1000
+Date: Wed Apr 25 09:52:22 2007 +1000
- update configure.ac for new 6.6.3 release
+ radeon: another attempt at fixing the mergedfb refresh rate
+
+ This attempts to keep it inside the 32-bit limit when multiplying things
out
+ later in the randr tree.
+
+ Let me know if I screwed this up..
-commit 6831297d79623d55c57cd7cd8ff90f08b8c68432
-Author: Dave Airlie <[EMAIL PROTECTED](none)>
-Date: Tue Sep 12 03:33:35 2006 +1000
+commit 3828237200fc16d4d32664fb8358950c213d4897
+Author: Dave Airlie <[EMAIL PROTECTED](none)>
+Date: Sun Apr 22 11:36:00 2007 +1000
- radeon: fallback render repeat for XAA, this fixes corruptions seen on
ubuntu
+ radeon: add support for DDC on some laptop chipsets
+
+ I noticed fglrx has DDC for the panel in the rs480 laptop, however radeon
+ didn't pick it up, so I valgrinded fglrx and spotted 0x1a0/0x1a4 accesses
+ I actually noticed this before from the BIOS but never figured it out.
- This isn't the correct fix, we should just fix the repeat case, but for a
- stable release this is much better idea
- (cherry picked from 84e574986f61c4f250d6ecb938bab20847618906 commit)
+ So now I get DDC from the LCD on this laptop.
-commit ddaacf78455290ffc31b41cd809b03ffbeadd69b
-Author: Ronald Wahl <[EMAIL PROTECTED]>
-Date: Wed Oct 4 00:55:43 2006 +1000
+commit c81ed9bd7b37c9d02141d10f6c7bad3d0c57032f
+Author: Dave Airlie <[EMAIL PROTECTED]>
+Date: Sat Apr 21 18:58:40 2007 +1000
- Hook up DFP power to DPMS events.
- (cherry picked from f96ddd32d3a9e64dc0adec5c50386d6db5b182ee commit)
+ radeon: fix build on older server
+
+commit 406eec71116a58d42288a7f1c809a92d5bda7350
+Author: Dave Airlie <[EMAIL PROTECTED]>
+Date: Sat Apr 21 18:56:28 2007 +1000
+
+ radeon: fix build since patches for IBM don't actually build
+
+commit ad119960095b4b64f4c6793f65950c9967ce4989
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Thu Apr 19 11:54:46 2007 +0200
+
+ Disable RMX for IBM Lewis server.
+
+ Due to the hardware layout RMX ddc_mode has to be set.
+ If ddc_mode is set, RADEONValdiateFPModes() shouldn't be called.
+ Bugzilla #10620 (3).
+
+commit 16ef77df4ebaf5ea13baa82972aaf98e71ac32ee
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Wed Apr 18 17:36:15 2007 +0200
+
+ Set sync polarity restriction flags even for non-"digital separate"
monitors.
+
+ According to Lisa Wu, this is correct regarding the VESA EEDID standard.
+ Bugzilla #10620 (2), original patch by Lisa Wu @ATI
+
+commit 0abce69f0d826a7ca1a41d963cd4730b6e01c145
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Wed Apr 18 17:32:52 2007 +0200
+
+ Fix inconsistent use of Mode lists.
+
+ Some scans used to only check every second entry, some stopped at the entry
+ before the last entry.
+ Bugzilla #10620 (1), original patch by Lisa Wu @ATI
+
+commit aea801cf9a5ce519a53d6fffd9a3a2e526ec79ea
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Fri Apr 13 16:16:05 2007 +0200
+
+ Fix crash if MergedFB and secondary head not found
+
+ If the secondary head isn't found (Monitor unplugged etc.) but MergedFB
+ is configured, the driver segfaults because it tries to access the mode
+ list private structures, which are not filled in.
+
+commit 07ddffb32e6293c77b32c94b87ec468caef3d6f5
+Author: Matthias Hopf <[EMAIL PROTECTED]>
+Date: Wed Apr 11 14:36:51 2007 +0200
+
+ Fixed typo in mode list generation.
+
+commit 4effa67ea75736a31b9e78a7b35acf74b067c43e
+Author: Dave Airlie <[EMAIL PROTECTED]>
+Date: Mon Apr 9 22:08:31 2007 +1000
+
+ radeon: add support for enabling direct rendering on RS480
+
+ Thanks to Matthew Garrett and Ubuntu for the hw loan to get this working.
+
+ Still no 3D driver support but at least you should get CP acceleration for
+ 2D now.
+
+commit 6b25a4c48796e022a093f3072574ffe9709ecaf4
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Wed Apr 4 10:47:29 2007 +0200
+
+ radeon: Link nearest modes by default for clone mode.
+
+ This makes sure all modes of both CRTCs will be available by default with
+ MergedFB.
+
+commit 3c892f163ec1fa9be6e733aab091c9b718f41efc
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
