summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-07-20[PATCH] EXA: reserve offscreen memory for DRI only when it is running.HEADmasterGeorge Sapountzis2-43/+62
2006-07-20[PATCH] Author info for EXA support.George Sapountzis1-2/+2
2006-07-20[PATCH] Merge atii2c.c in atimach64i2c.c, part #2.George Sapountzis5-403/+338
Move I2CBus functions.
2006-07-20[PATCH] Merge atii2c.c in atimach64i2c.c, part #1.George Sapountzis6-57/+41
Move Init/Free functions.
2006-06-14[PATCH] Reduce maximum width/height for hardware-accelerated operations to ↵originGeorge Fufutos2-9/+25
half the current values. EXA hits these limits for some operations on offscreen pixmaps and GTPRO seems to support the reduced signed limits.
2006-06-14[PATCH] Minor MMIO cache testing fixes.George Fufutos1-79/+70
Remove superflous MMIO cache test. Also, move the test for Block1Base outside TestRegisterCachingXV() (for scaler and overlay registers) in preperation for caching some 3D registers as well.
2006-06-14[PATCH] Add memcpy-based UTS/DFS.George Fufutos1-6/+68
EXA hits more optimized paths when it does not have to fallback because of missing UTS/DFS.
2006-05-12Go for full MMIO testing when mapping apertures later on.Luc Verhaegen2-52/+4
This also removes the left-over inw Donnie Berkholz uncovered again :)
2006-05-07[PATCH] Replace ATIMach64Sync() with exaWaitSync() for EXA copy hook.George Fufutos1-2/+4
This makes sure that EXA has been notified that we have synced, avoiding excessive WaitMarker() calls (as per EXA documentation).
2006-05-07[PATCH] Update comment explaining the old buggy method for circumventing ↵George Fufutos1-136/+64
framebuffer caching for CPU reads. Also, factor out to an inline function the code to test register caching.
2006-05-07[PATCH] Fix corruption associated with the engine randomly not waiting for a ↵George Fufutos2-0/+24
copy operation to commit (bug 807, Ivor Hewitt ivor@ivor.org, Marc Aurele La France). Explicitely sync at the end of a copy operation.
2006-05-07[PATCH] Fix corruption when scaling 1-pixel wide pixmaps [1/1] (bug 807, ↵George Fufutos1-1/+104
Ivor Hewitt ivor@ivor.org, Marc Aurele La France). The problem shows itself when scaling a 1 pixel wide pixmap onto the screen, the first CPU read of the framebuffer will return stale data. Always invalidate the read-back (or read buffer) cache in ATIMach64Sync(). This bug always manifests itself in RENDER with EXA: RENDER commonly uses 1x1 repeating pictures in composite operations. In some cases it is possible to reduce the composite operation with 1x1 repeating pictures to a solid operation. This solid operation gets accelerated and when the pixmap is read back from the framebuffer corruption appears. With this patch, mach64 EXA passes rendercheck.
2006-05-07[PATCH] Fix corruption when scaling 1-pixel wide pixmaps [0/1] (bug 807, ↵George Fufutos3-1/+17
Ivor Hewitt ivor@ivor.org, Marc Aurele La France). The problem shows itself when scaling a 1 pixel wide pixmap onto the screen, the first CPU read of the framebuffer will return stale data. Add support for manipulating the MEM_BUF_CNTL register and invalidating the read-back (or read buffer) cache.
2006-04-30[PATCH] Force HW cursor when switching to DRI.George Fufutos1-2/+10
This fixes a bug where the cursor whould flicker when moved over DRI clients and the area below the cursor would seem like remembering the previous frame. Fix copied from radeon driver (Michel Daenzer).
2006-04-30[PATCH] Prefer double-buffered visuals for GLX.George Fufutos1-2/+2
This is desirable in a number of situations, in particular when running a GLX compositing manager with AIGLX. Fix copied from radeon driver (Michel Daenzer, Kristian Hoegsberg).
2006-04-28Decently define CPPFLAGS before calling AC_PREPROC_IFELSE (Eric Anholt)Luc Verhaegen1-2/+5
2006-04-28Remove PATI_FROM_SCREEN macro.Luc Verhaegen1-33/+36
2006-04-27[PATCH] Fix EXA for pixmaps with depth other than the native framebuffer depth.George Fufutos2-59/+148
This case comes up with the "smart" migration scheme and requires to set the DP_PIX_WIDTH register to the depth of the pixmap.
2006-04-27When AVOID_CPIO, avoid using CPIO when finding out FB aperture size.Luc Verhaegen1-24/+39
When mapping MMIO, we now go back to testing both the end of 8 and 4MB apertures, and we stop touching CONFIG_CNTL before MMIO is mapped. (reported by Donnie Berkholz)
2006-04-25Remove ChangeLog. Will be replaced in packaged releases by git-log output.Luc Verhaegen1-673/+0
2006-04-24Make pATI->Cursor into a Bool pATI->HWCursor.Luc Verhaegen5-22/+17
2006-04-23Remove pATIHW define for the real thing.Luc Verhaegen1-195/+192
2006-04-23Remove MMIOInLinear, we can use pATI->Chips for that now.Luc Verhaegen3-13/+8
2006-04-23Move detection of MMIO area to Mach64MMIODetectAndMap. This takes theLuc Verhaegen3-182/+191
appearance of BAR2 at VT into account.
2006-04-23Remove actual ATI_OPTION_LINEAR.Luc Verhaegen1-34/+0
2006-04-21[PATCH] Fix I2C bus Mach64 initialisation failure (Samuel Thibault, #6623)George Fufutos1-6/+25
2006-04-21Cull OptionLinear mindlessly.Luc Verhaegen3-94/+56
Less than ideal currently, but end point is proper failure when first BAR isn't useful.
2006-04-21Remove atioption.c/h: Consolidate option handling in aticonfig.h/c.Luc Verhaegen7-403/+154
2006-04-20Fix the case where VGA aperture clutters up pATI->pMemory. Banked must die.Luc Verhaegen1-3/+3
2006-04-20Try to tie IO location to pci-id. Still needs to be narrowed down though.Luc Verhaegen1-4/+12
2006-04-20[PATCH] Move ATIInitializeXVideo to atimach64xv.c .George Fufutos7-121/+58
2006-04-20[PATCH] Consolidate ATIXVInitializeAdaptor with ATIMach64XVInitialiseAdaptor.George Fufutos5-85/+44
From nobody Mon Sep 17 00:00:00 2001 From: George Fufutos <fufutos610@hotmail.com> Date: Thu Apr 20 03:51:18 2006 +0300 Subject: [PATCH] Move ATIInitializeXVideo to atimach64xv.c . --- src/Makefile.am | 3 +- src/atimach64xv.c | 51 +++++++++++++++++++++++++++++++++ src/atimach64xv.h | 2 + src/atipreinit.c | 2 + src/atiscreen.c | 6 ++-- src/atixv.c | 81 ----------------------------------------------------- src/atixv.h | 34 ---------------------- 7 files changed, 58 insertions(+), 121 deletions(-) delete mode 100644 src/atixv.c delete mode 100644 src/atixv.h 61013bf6da0159776d349ca78d6e0076d2fded3e diff --git a/src/Makefile.am b/src/Makefile.am index 2c5f122..9c8304a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,7 +53,7 @@ mach64_drv_la_SOURCES = \ atidecoder.c atidsp.c atii2c.c atilock.c atimach64.c atimach64accel.c \ atimach64cursor.c atimach64i2c.c atimach64io.c atimach64xv.c \ atimode.c atipreinit.c atiprint.c atirgb514.c atiscreen.c \ - atituner.c atiutil.c ativalid.c atixv.c atiload.c ati.c \ + atituner.c atiutil.c ativalid.c atiload.c ati.c \ $(ATIMISC_DRI_SRCS) $(ATIMISC_DGA_SOURCES) $(ATI_CPIO_SOURCES) \ $(ATIMISC_EXA_SOURCES) @@ -102,7 +102,6 @@ EXTRA_DIST = \ atividmem.h \ atiwonder.h \ atiwonderio.h \ - atixv.h \ mach64_common.h \ mach64_dri.h \ mach64_sarea.h diff --git a/src/atimach64xv.c b/src/atimach64xv.c index 9a3d034..5309ce6 100644 --- a/src/atimach64xv.c +++ b/src/atimach64xv.c @@ -1513,6 +1513,27 @@ ( } /* + * ATIXVFreeAdaptorInfo -- + * + * Free XVideo adaptor information. + */ +static void +ATIXVFreeAdaptorInfo +( + XF86VideoAdaptorPtr *ppAdaptor, + int nAdaptor +) +{ + if (!ppAdaptor) + return; + + while (nAdaptor > 0) + xfree(ppAdaptor[--nAdaptor]); + + xfree(ppAdaptor); +} + +/* * ATIXVPreInit -- * * This function is called by ATIPreInit() to set up the environment required @@ -1531,6 +1552,36 @@ #ifndef AVOID_CPIO #endif /* AVOID_CPIO */ (void)xf86XVRegisterGenericAdaptorDriver(ATIMach64XVInitialiseAdaptor); +} + +/* + * 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; } /* diff --git a/src/atimach64xv.h b/src/atimach64xv.h index bed7048..6aaed2f 100644 --- a/src/atimach64xv.h +++ b/src/atimach64xv.h @@ -29,6 +29,8 @@ #include "atipriv.h" #include "xf86str.h" #include "xf86xv.h" +extern void ATIXVPreInit(ATIPtr); +extern Bool ATIInitializeXVideo(ScreenPtr, ScrnInfoPtr, ATIPtr); extern void ATIMach64CloseXVideo(ScreenPtr, ScrnInfoPtr, ATIPtr); #endif /* ___ATIMACH64XV_H___ */ diff --git a/src/atipreinit.c b/src/atipreinit.c index 6297c5f..f334b27 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -46,12 +46,12 @@ #include "atimach64.h" #include "atimach64accel.h" #include "atimach64cursor.h" #include "atimach64io.h" +#include "atimach64xv.h" #include "atimode.h" #include "atipreinit.h" #include "atiprint.h" #include "atividmem.h" #include "atiwonderio.h" -#include "atixv.h" #include "vbe.h" #include "xf86RAC.h" diff --git a/src/atiscreen.c b/src/atiscreen.c index 05fb43c..537622f 100644 --- a/src/atiscreen.c +++ b/src/atiscreen.c @@ -39,12 +39,12 @@ #include "atidac.h" #include "atidga.h" #include "atidri.h" #include "atimach64.h" +#include "atimach64accel.h" +#include "atimach64cursor.h" +#include "atimach64xv.h" #include "atimode.h" #include "atiscreen.h" #include "atistruct.h" -#include "atixv.h" -#include "atimach64accel.h" -#include "atimach64cursor.h" #ifdef XF86DRI_DEVEL #include "mach64_dri.h" diff --git a/src/atixv.c b/src/atixv.c deleted file mode 100644 index bd0cb83..0000000 --- a/src/atixv.c +++ /dev/null @@ -1,81 +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), tsi@xfree86.org - * - * 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 "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); -} - -/* - * 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; -} diff --git a/src/atixv.h b/src/atixv.h deleted file mode 100644 index fe5d119..0000000 --- a/src/atixv.h +++ /dev/null @@ -1,34 +0,0 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atixv.h,v 1.4 2003/04/23 21:51:31 tsi Exp $ */ -/* - * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org - * - * 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 ___ATIXV_H___ -#define ___ATIXV_H___ 1 - -#include "atipriv.h" - -#include "xf86str.h" - -extern void ATIXVPreInit(ATIPtr); -extern Bool ATIInitializeXVideo(ScreenPtr, ScrnInfoPtr, ATIPtr); - -#endif /* ___ATIXV_H___ */ -- 1.3.0.rc3.g944e-dirty
2006-04-20Remove some trivial ugliness from atividmem.cLuc Verhaegen5-131/+61
2006-04-20[PATCH] Consolidate aticursor.c and atimach64cursor.cGeorge Fufutos9-127/+44
2006-04-20Fix MMIO mapping.Luc Verhaegen3-302/+236
We can get to MMIO on the GX as well, even when it's not primary. So assume that we can always map the IO area.
2006-04-18[PATCH] Remove unnecessary check for DRI enabled.George Fufutos1-7/+0
2006-04-18ATI_BUS_PCI was altered, so stop using it to interprete GX/CX bus type.Luc Verhaegen1-1/+1
2006-04-18Consolidate ATIInitializeAcceleration() with ATIMach64AccelInit().George Fufutos6-132/+50
2006-04-18Move memory manager setup for XAA with no DRI from atiaccel.c to atiscreen.cGeorge Fufutos2-33/+47
along with memory manager setup for XAA with DRI.
2006-04-18Move ATIResizeOffscreenLinear() from atiaccel.c to atimach64xv.c and makeGeorge Fufutos3-50/+49
it static. It is only used by XV memory management functions.
2006-04-18Drop ifdef AVOID_CPIO for xf86HandleColormaps. It's identical in both cases.George Fufutos1-11/+0
2006-04-17Split up Mach64ChipIDInfo:Luc Verhaegen2-58/+74
- chip version on the basis of revision -> Mach64ChipRevisionId. - Bus checking -> Mach64BusType. - LCDVBlendFIFOSize -> Mach64PanelInfoGet.
2006-04-17[PATCH] Move 3 large Panel related blocks out of PreInit into their own ↵Luc Verhaegen2-762/+696
functions.
2006-04-16[PATCH] Revert accidental change to list double-buffered visuals first.George Fufutos1-2/+2
2006-04-16[PATCH] EXA support.George Fufutos19-338/+1225
2006-04-16Remove last remnants of checking whether we have PCIInfo.Luc Verhaegen4-116/+37
If we don't have PCIInfo, then we shouldn't have progressed beyond Probe in the first place.
2006-04-16Remove pATI->IsVGAWonder by replacing it withLuc Verhaegen7-30/+23
((pATI->Chip < ATI_CHIP_264CT) && pATI->IsVGA).
2006-04-15The VGAWonder IO range is always 0x1CE, so use a #define and just track a BoolLuc Verhaegen9-121/+105
IsVGAWonder instead. Move CPIOBase resource claim next to the retrieval of the address.
2006-04-15Start using a cleaned up version of ATIClaimResources again. This dropped offLuc Verhaegen9-229/+85
when i made the leap to clean Probe. Proper fixed resource handling needs to be moved into Probe again though.
2006-04-14Unwrap libc and fix a daft AVOID_CPIO dependant formatting warning.Luc Verhaegen17-1/+67
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-14 19:52:21 +0000