xserver-xorg-video-neomagic: Changes to 'upstream-unstable'
.gitignore | 70 ++++++++
ChangeLog | 73 ---------
Makefile.am | 11 +
configure.ac | 12 -
man/.cvsignore | 2
src/.cvsignore | 6
src/Makefile.am | 1
src/neo.h | 6
src/neo_bank.c | 92 -----------
src/neo_driver.c | 439 +++++++++++++++++++++++--------------------------------
src/neo_video.c | 1
11 files changed, 270 insertions(+), 443 deletions(-)
New commits:
commit dbcbef42e4ea74e20313e4f5437067cc5cfb7024
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 22:01:02 2009 -0500
configure.ac: remove unused sdkdir=$(pkg-config...) statement
The sdkdir variable isn't use, so remove the statement.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 358c0dd..a19183b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,6 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
save_CFLAGS="$CFLAGS"
CFLAGS="$XORG_CFLAGS"
commit 4174c802bdac50bd62981bf548efa84ee15bf2b2
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 30 12:50:10 2009 -0500
Remove banked framebuffer mode
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index c09962b..e07e52e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,7 +33,6 @@ neomagic_drv_la_SOURCES = \
neo_2090.c \
neo_2097.c \
neo_2200.c \
- neo_bank.c \
neo_cursor.c \
neo_dga.c \
neo_driver.c \
diff --git a/src/neo.h b/src/neo.h
index c412792..718b8a5 100644
--- a/src/neo.h
+++ b/src/neo.h
@@ -107,11 +107,6 @@ extern Bool NeoCursorInit(ScreenPtr pScrn);
extern void NeoShowCursor(ScrnInfoPtr pScrn);
extern void NeoHideCursor(ScrnInfoPtr pScrn);
-/* in neo_bank.c */
-int NEOSetReadWrite(ScreenPtr pScreen, int bank);
-int NEOSetWrite(ScreenPtr pScreen, int bank);
-int NEOSetRead(ScreenPtr pScreen, int bank);
-
/* in neo_i2c.c */
extern Bool neo_I2CInit(ScrnInfoPtr pScrn);
@@ -237,7 +232,6 @@ typedef struct neoRec
int NeoPanelHeight;
/* options */
OptionInfoPtr Options;
- Bool noLinear;
Bool noAccel;
Bool noAccelSet;
Bool swCursor;
diff --git a/src/neo_bank.c b/src/neo_bank.c
deleted file mode 100644
index ec014ce..0000000
--- a/src/neo_bank.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/**********************************************************************
-Copyright 1998, 1999 by Precision Insight, Inc., Cedar Park, Texas.
-
- All Rights Reserved
-
-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 Precision Insight not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission. Precision Insight
-and its suppliers make no representations about the suitability of this
-software for any purpose. It is provided "as is" without express or
-implied warranty.
-
-PRECISION INSIGHT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
-**********************************************************************/
-
-/*
- * The original Precision Insight driver for
- * XFree86 v.3.3 has been sponsored by Red Hat.
- *
- * Authors:
- * Jens Owen (jens@tungstengraphics.com)
- * Kevin E. Martin (kevin@precisioninsight.com)
- *
- * Port to Xfree86 v.4.0
- * 1998, 1999 by Egbert Eich (Egbert.Eich@Physik.TU-Darmstadt.DE)
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#define PSZ 8
-
-/* All drivers should typically include these */
-#include "xf86.h"
-#include "xf86_OSproc.h"
-
-/* Everything using inb/outb, etc needs "compiler.h" */
-#include "compiler.h"
-
-/* Driver specific headers */
-#include "neo.h"
-
-int
-NEOSetReadWrite(ScreenPtr pScreen, int bank)
-{
- IOADDRESS ioBase = xf86Screens[pScreen->myNum]->domainIOBase + 0x3CE;
- unsigned char tmp;
-
- outb(ioBase, 0x11);
- tmp = inb(ioBase + 1);
- outw(ioBase, (( tmp & 0xFC ) << 8 ) | 0x11);
- outw(ioBase, ((((bank << 2) & 0xFF) << 8) | 0x15));
- return 0;
-}
-
-int
-NEOSetWrite(ScreenPtr pScreen, int bank)
-{
- IOADDRESS ioBase = xf86Screens[pScreen->myNum]->domainIOBase + 0x3CE;
- unsigned char tmp;
-
- outb(ioBase, 0x11);
- tmp = inb(ioBase + 1);
- outw(ioBase, ((( tmp & 0xFC ) | 0x01 ) << 8 ) | 0x11);
- outw(ioBase, ((((bank << 2) & 0xFF) << 8) | 0x16));
- return 0;
-}
-
-
-int
-NEOSetRead(ScreenPtr pScreen, int bank)
-{
- IOADDRESS ioBase = xf86Screens[pScreen->myNum]->domainIOBase + 0x3CE;
- unsigned char tmp;
-
- outb(ioBase, 0x11);
- tmp = inb(ioBase + 1);
- outw(ioBase, ((( tmp & 0xFC ) | 0x01 ) << 8 ) | 0x11);
- outw(ioBase, ((((bank << 2) & 0xFF) << 8) | 0x15));
- return 0;
-}
diff --git a/src/neo_driver.c b/src/neo_driver.c
index f853107..9b40943 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -75,9 +75,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/* All drivers implementing backing store need this */
#include "mibstore.h"
-/* All drivers using the mi banking wrapper need this */
-#include "mibank.h"
-
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"
@@ -335,7 +332,6 @@ static IsaChipsets NEOISAchipsets[] = {
/* The options supported by the Neomagic Driver */
typedef enum {
- OPTION_NOLINEAR_MODE,
OPTION_NOACCEL,
OPTION_SW_CURSOR,
OPTION_NO_MMIO,
@@ -383,7 +379,6 @@ static const OptionInfoRec NEO_2070_Options[] = {
};
static const OptionInfoRec NEOOptions[] = {
- { OPTION_NOLINEAR_MODE,"NoLinear", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_NO_MMIO, "noMMIO", OPTV_BOOLEAN, {0}, FALSE },
@@ -956,7 +951,6 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, nPtr->Options);
- xf86GetOptValBool(nPtr->Options, OPTION_NOLINEAR_MODE,&nPtr->noLinear);
xf86GetOptValBool(nPtr->Options, OPTION_SW_CURSOR,&nPtr->swCursor);
xf86GetOptValBool(nPtr->Options, OPTION_NO_MMIO,&nPtr->noMMIO);
xf86GetOptValBool(nPtr->Options, OPTION_INTERN_DISP,&nPtr->internDisp);
@@ -1082,10 +1076,6 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
if (nPtr->lcdCenter)
xf86DrvMsg(pScrn->scrnIndex,X_CONFIG,
"Video modes are centered on the display\n");
- if (nPtr->noLinear)
- xf86DrvMsg(pScrn->scrnIndex,X_CONFIG, "using nonlinear mode\n");
- else
- xf86DrvMsg(pScrn->scrnIndex,X_DEFAULT, "using linear mode\n");
if (nPtr->swCursor)
xf86DrvMsg(pScrn->scrnIndex,X_CONFIG, "using sofware cursor\n");
if (nPtr->noMMIO)
@@ -1099,17 +1089,9 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex,X_CONFIG,
"Show chache for debugging\n");
if (nPtr->shadowFB) {
- if (nPtr->noLinear) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- "Option \"ShadowFB\" ignored. Not supported without"
- " linear addressing\n");
- nPtr->shadowFB = FALSE;
- nPtr->rotate = 0;
- } else {
- nPtr->noAccel = TRUE;
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
- "Using \"Shadow Framebuffer\" - acceleration disabled\n");
- }
+ nPtr->noAccel = TRUE;
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "Using \"Shadow Framebuffer\" - acceleration disabled\n");
}
nPtr->NeoFbMapSize = linearSize * 1024;
@@ -1203,7 +1185,7 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
linearRes[0].rBegin = nPtr->NeoLinearAddr;
linearRes[1].rEnd = nPtr->NeoLinearAddr + nPtr->NeoFbMapSize - 1;
if (xf86RegisterResources(nPtr->pEnt->index,linearRes,ResNone)) {
- nPtr->noLinear = TRUE; /* XXX */
+ RETURN;
}
}
#endif
@@ -1331,10 +1313,8 @@ NEOPreInit(ScrnInfoPtr pScrn, int flags)
RETURN;
}
- if (!nPtr->noLinear) {
- if (!xf86LoadSubModule(pScrn, "xaa"))
- RETURN;
- }
+ if (!xf86LoadSubModule(pScrn, "xaa"))
+ RETURN;
if (nPtr->shadowFB) {
if (!xf86LoadSubModule(pScrn, "shadow")) {
@@ -1550,134 +1530,105 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
nAcl->UseHWCursor = FALSE;
nAcl->CursorAddress = -1;
- if (nPtr->noLinear) {
- miBankInfoPtr pBankInfo;
-
- /* Setup the vga banking variables */
- pBankInfo = (miBankInfoPtr)xnfcalloc(sizeof(miBankInfoRec),1);
- if (pBankInfo == NULL)
- return FALSE;
-
- pBankInfo->pBankA = hwp->Base;
- pBankInfo->pBankB = (unsigned char *)hwp->Base;
- pBankInfo->BankSize = 0x10000;
- pBankInfo->nBankDepth = pScrn->depth;
-
- pBankInfo->SetSourceBank = (miBankProcPtr)NEOSetRead;
- pBankInfo->SetDestinationBank =
- (miBankProcPtr)NEOSetWrite;
- pBankInfo->SetSourceAndDestinationBanks =
- (miBankProcPtr)NEOSetReadWrite;
- if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY,
- pScrn->displayWidth, pBankInfo)) {
- xfree(pBankInfo);
- pBankInfo = NULL;
- return FALSE;
- }
- xf86DrvMsg(pScrn->scrnIndex,X_INFO, "Using nonlinear mode\n");
- xf86DrvMsg(pScrn->scrnIndex,X_INFO, "Using software cursor in "
- "nonlinear mode\n");
+ nAcl->cacheStart = -1;
+ nAcl->cacheEnd = -1;
+ xf86DrvMsg(pScrn->scrnIndex,X_INFO,
+ "Using linear framebuffer at: 0x%08lX\n",
+ nPtr->NeoLinearAddr);
+ /* Setup pointers to free space in video ram */
+ allocatebase = (pScrn->videoRam << 10);
+ freespace = allocatebase - pScrn->displayWidth *
+ pScrn->virtualY * (pScrn->bitsPerPixel >> 3);
+ currentaddr = allocatebase;
+ xf86DrvMsg(scrnIndex, X_PROBED,
+ "%d bytes off-screen memory available\n", freespace);
+
+ if (nPtr->swCursor || !nPtr->NeoMMIOBase) {
+ xf86DrvMsg(scrnIndex, X_CONFIG,
+ "Using Software Cursor.\n");
+ } else if (nPtr->NeoCursorMem <= freespace) {
+ currentaddr -= nPtr->NeoCursorMem;
+ freespace -= nPtr->NeoCursorMem;
+ /* alignment */
+ freespace -= currentaddr & 0x3FF;
+ currentaddr &= 0xfffffc00;
+ nAcl->CursorAddress = currentaddr;
+ xf86DrvMsg(scrnIndex, X_INFO,
+ "Using H/W Cursor.\n");
} else {
- nAcl->cacheStart = -1;
- nAcl->cacheEnd = -1;
- xf86DrvMsg(pScrn->scrnIndex,X_INFO,
- "Using linear framebuffer at: 0x%08lX\n",
- nPtr->NeoLinearAddr);
- /* Setup pointers to free space in video ram */
- allocatebase = (pScrn->videoRam << 10);
- freespace = allocatebase - pScrn->displayWidth *
- pScrn->virtualY * (pScrn->bitsPerPixel >> 3);
- currentaddr = allocatebase;
- xf86DrvMsg(scrnIndex, X_PROBED,
- "%d bytes off-screen memory available\n", freespace);
-
- if (nPtr->swCursor || !nPtr->NeoMMIOBase) {
- xf86DrvMsg(scrnIndex, X_CONFIG,
- "Using Software Cursor.\n");
- } else if (nPtr->NeoCursorMem <= freespace) {
- currentaddr -= nPtr->NeoCursorMem;
- freespace -= nPtr->NeoCursorMem;
- /* alignment */
- freespace -= currentaddr & 0x3FF;
- currentaddr &= 0xfffffc00;
- nAcl->CursorAddress = currentaddr;
- xf86DrvMsg(scrnIndex, X_INFO,
- "Using H/W Cursor.\n");
- } else {
- xf86DrvMsg(scrnIndex, X_ERROR,
- "Too little space for H/W cursor.\n");
- }
-
- if (!nPtr->noAccel && !nPtr->NeoMMIOBase)
- xf86DrvMsg(pScrn->scrnIndex,X_INFO,
- "Acceleration disabled when not using MMIO\n");
-
- if (nPtr->overlay > 0){
- if (nPtr->overlay > freespace){
- xf86DrvMsg(pScrn->scrnIndex,X_INFO,
- "Can not reserve %d bytes for overlay. "
- "Resize to %d bytes.\n",
- nPtr->overlay, freespace);
- nPtr->overlay = freespace;
- }
- currentaddr -= nPtr->overlay;
- freespace -= nPtr->overlay;
- nPtr->overlay_offset = currentaddr;
- xf86DrvMsg(pScrn->scrnIndex,X_INFO,"Overlay at 0x%x\n",
- nPtr->overlay_offset);
- }
-
- nAcl->cacheStart = currentaddr - freespace;
- nAcl->cacheEnd = currentaddr;
- freespace = 0;
- if (nAcl->cacheStart < nAcl->cacheEnd) {
- BoxRec AvailFBArea;
- int lines = nAcl->cacheEnd /
- (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
- if (!nPtr->noAccel && nPtr->NeoMMIOBase && lines > 1024)
- lines = 1024;
- AvailFBArea.x1 = 0;
- AvailFBArea.y1 = 0;
- AvailFBArea.x2 = pScrn->displayWidth;
- AvailFBArea.y2 = lines;
- xf86InitFBManager(pScreen, &AvailFBArea);
-
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Using %i scanlines of offscreen memory \n",
- lines - pScrn->virtualY);
- }
-
- /* Setup the acceleration primitives */
- if (!nPtr->noAccel && nPtr->NeoMMIOBase) {
- Bool ret = FALSE;
- if (nAcl->cacheStart >= nAcl->cacheEnd) {
- xf86DrvMsg(scrnIndex, X_ERROR,
- "Too little space for pixmap cache.\n");
- }
- switch(nPtr->NeoChipset) {
- case NM2070 :
- ret = Neo2070AccelInit(pScreen);
- break;
- case NM2090 :
- case NM2093 :
- ret = Neo2090AccelInit(pScreen);
- break;
- case NM2097 :
- case NM2160 :
- ret = Neo2097AccelInit(pScreen);
- break;
- case NM2200 :
- case NM2230 :
- case NM2360 :
- case NM2380 :
- ret = Neo2200AccelInit(pScreen);
- break;
- }
- xf86DrvMsg(pScrn->scrnIndex,X_INFO,
- "Acceleration %s Initialized\n",ret ? "" : "not");
- }
-
+ xf86DrvMsg(scrnIndex, X_ERROR,
+ "Too little space for H/W cursor.\n");
}
+
+ if (!nPtr->noAccel && !nPtr->NeoMMIOBase)
+ xf86DrvMsg(pScrn->scrnIndex,X_INFO,
+ "Acceleration disabled when not using MMIO\n");
+
+ if (nPtr->overlay > 0){
+ if (nPtr->overlay > freespace){
+ xf86DrvMsg(pScrn->scrnIndex,X_INFO,
+ "Can not reserve %d bytes for overlay. "
+ "Resize to %d bytes.\n",
+ nPtr->overlay, freespace);
+ nPtr->overlay = freespace;
+ }
+ currentaddr -= nPtr->overlay;
+ freespace -= nPtr->overlay;
+ nPtr->overlay_offset = currentaddr;
+ xf86DrvMsg(pScrn->scrnIndex,X_INFO,"Overlay at 0x%x\n",
+ nPtr->overlay_offset);
+ }
+
+ nAcl->cacheStart = currentaddr - freespace;
+ nAcl->cacheEnd = currentaddr;
+ freespace = 0;
+ if (nAcl->cacheStart < nAcl->cacheEnd) {
+ BoxRec AvailFBArea;
+ int lines = nAcl->cacheEnd /
+ (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
+ if (!nPtr->noAccel && nPtr->NeoMMIOBase && lines > 1024)
+ lines = 1024;
+ AvailFBArea.x1 = 0;
+ AvailFBArea.y1 = 0;
+ AvailFBArea.x2 = pScrn->displayWidth;
+ AvailFBArea.y2 = lines;
+ xf86InitFBManager(pScreen, &AvailFBArea);
+
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Using %i scanlines of offscreen memory \n",
+ lines - pScrn->virtualY);
+ }
+
+ /* Setup the acceleration primitives */
+ if (!nPtr->noAccel && nPtr->NeoMMIOBase) {
+ Bool ret = FALSE;
+ if (nAcl->cacheStart >= nAcl->cacheEnd) {
+ xf86DrvMsg(scrnIndex, X_ERROR,
+ "Too little space for pixmap cache.\n");
+ }
+ switch(nPtr->NeoChipset) {
+ case NM2070 :
+ ret = Neo2070AccelInit(pScreen);
+ break;
+ case NM2090 :
+ case NM2093 :
+ ret = Neo2090AccelInit(pScreen);
+ break;
+ case NM2097 :
+ case NM2160 :
+ ret = Neo2097AccelInit(pScreen);
+ break;
+ case NM2200 :
+ case NM2230 :
+ case NM2360 :
+ case NM2380 :
+ ret = Neo2200AccelInit(pScreen);
+ break;
+ }
+ xf86DrvMsg(pScrn->scrnIndex,X_INFO,
+ "Acceleration %s Initialized\n",ret ? "" : "not");
+ }
+
miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);
@@ -1745,10 +1696,8 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
xf86DPMSInit(pScreen, (DPMSSetProcPtr)NeoDisplayPowerManagementSet,
0);
- if (!nPtr->noLinear) {
- pScrn->memPhysBase = (unsigned long)nPtr->NeoLinearAddr;
- pScrn->fbOffset = 0;
- }
+ pScrn->memPhysBase = (unsigned long)nPtr->NeoLinearAddr;
+ pScrn->fbOffset = 0;
/* Wrap the current CloseScreen function */
nPtr->CloseScreen = pScreen->CloseScreen;
@@ -1975,85 +1924,80 @@ neoMapMem(ScrnInfoPtr pScrn)
NEOPtr nPtr = NEOPTR(pScrn);
vgaHWPtr hwp = VGAHWPTR(pScrn);
- if (!nPtr->noLinear) {
- if (!nPtr->noMMIO) {
- if (nPtr->pEnt->location.type == BUS_PCI){
+ if (!nPtr->noMMIO) {
+ if (nPtr->pEnt->location.type == BUS_PCI){
#ifndef XSERVER_LIBPCIACCESS
- nPtr->NeoMMIOBase =
- xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
- nPtr->PciTag, nPtr->NeoMMIOAddr,
- 0x200000L);
- if (nPtr->NeoMMIOAddr2 != 0){
- nPtr->NeoMMIOBase2 =
- xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
- nPtr->PciTag, nPtr->NeoMMIOAddr2,
- 0x100000L);
- }
+ nPtr->NeoMMIOBase =
+ xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
+ nPtr->PciTag, nPtr->NeoMMIOAddr,
+ 0x200000L);
+ if (nPtr->NeoMMIOAddr2 != 0){
+ nPtr->NeoMMIOBase2 =
+ xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
+ nPtr->PciTag, nPtr->NeoMMIOAddr2,
+ 0x100000L);
+ }
#else
- void** result = (void**)&nPtr->NeoMMIOBase;
- int err = pci_device_map_range(nPtr->PciInfo,
- nPtr->NeoMMIOAddr,
- 0x200000L,
- PCI_DEV_MAP_FLAG_WRITABLE,
- result);
- if (err)
- return FALSE;
-
- if (nPtr->NeoMMIOAddr2 != 0){
- result = (void**)&nPtr->NeoMMIOBase2;
- err = pci_device_map_range(nPtr->PciInfo,
- nPtr->NeoMMIOAddr2,
- 0x100000L,
- PCI_DEV_MAP_FLAG_WRITABLE,
- result);
-
- if (err)
- return FALSE;
- }
+ void** result = (void**)&nPtr->NeoMMIOBase;
+ int err = pci_device_map_range(nPtr->PciInfo,
+ nPtr->NeoMMIOAddr,
+ 0x200000L,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+ if (err)
+ return FALSE;
+
+ if (nPtr->NeoMMIOAddr2 != 0){
+ result = (void**)&nPtr->NeoMMIOBase2;
+ err = pci_device_map_range(nPtr->PciInfo,
+ nPtr->NeoMMIOAddr2,
+ 0x100000L,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
#endif
- } else
- nPtr->NeoMMIOBase =
- xf86MapVidMem(pScrn->scrnIndex,
- VIDMEM_MMIO, nPtr->NeoMMIOAddr,
- 0x200000L);
- if (nPtr->NeoMMIOBase == NULL)
- return FALSE;
- }
+ } else
+ nPtr->NeoMMIOBase =
+ xf86MapVidMem(pScrn->scrnIndex,
+ VIDMEM_MMIO, nPtr->NeoMMIOAddr,
+ 0x200000L);
+ if (nPtr->NeoMMIOBase == NULL)
+ return FALSE;
+ }
- if (nPtr->pEnt->location.type == BUS_PCI)
+ if (nPtr->pEnt->location.type == BUS_PCI)
#ifndef XSERVER_LIBPCIACCESS
- nPtr->NeoFbBase =
- xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
- nPtr->PciTag,
- (unsigned long)nPtr->NeoLinearAddr,
- nPtr->NeoFbMapSize);
+ nPtr->NeoFbBase =
+ xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
+ nPtr->PciTag,
+ (unsigned long)nPtr->NeoLinearAddr,
+ nPtr->NeoFbMapSize);
#else
- {
- void** result = (void**)&nPtr->NeoFbBase;
- int err = pci_device_map_range(nPtr->PciInfo,
- nPtr->NeoLinearAddr,
- nPtr->NeoFbMapSize,
- PCI_DEV_MAP_FLAG_WRITABLE |
- PCI_DEV_MAP_FLAG_WRITE_COMBINE,
- result);
- if (err)
- return FALSE;
- }
-#endif
- else
- nPtr->NeoFbBase =
- xf86MapVidMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
- (unsigned long)nPtr->NeoLinearAddr,
- nPtr->NeoFbMapSize);
- if (nPtr->NeoFbBase == NULL)
- return FALSE;
- } else {
- /* In paged mode Base is the VGA window at 0xA0000 */
- nPtr->NeoFbBase = hwp->Base;
+ {
+ void** result = (void**)&nPtr->NeoFbBase;
+ int err = pci_device_map_range(nPtr->PciInfo,
+ nPtr->NeoLinearAddr,
+ nPtr->NeoFbMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+ if (err)
+ return FALSE;
}
+#endif
+ else
+ nPtr->NeoFbBase =
+ xf86MapVidMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
+ (unsigned long)nPtr->NeoLinearAddr,
+ nPtr->NeoFbMapSize);
+ if (nPtr->NeoFbBase == NULL)
+ return FALSE;
return TRUE;
}
@@ -2066,32 +2010,30 @@ neoUnmapMem(ScrnInfoPtr pScrn)
{
NEOPtr nPtr = NEOPTR(pScrn);
- if (!nPtr->noLinear) {
#ifndef XSERVER_LIBPCIACCESS
- if (nPtr->NeoMMIOBase)
- xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoMMIOBase,
- 0x200000L);
+ if (nPtr->NeoMMIOBase)
+ xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoMMIOBase,
+ 0x200000L);
#else
- if (nPtr->NeoMMIOBase)
- pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoMMIOBase, 0x200000L);
+ if (nPtr->NeoMMIOBase)
+ pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoMMIOBase, 0x200000L);
#endif
- nPtr->NeoMMIOBase = NULL;
+ nPtr->NeoMMIOBase = NULL;
#ifndef XSERVER_LIBPCIACCESS
- if (nPtr->NeoMMIOBase2)
- xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoMMIOBase2,
- 0x100000L);
+ if (nPtr->NeoMMIOBase2)
+ xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoMMIOBase2,
+ 0x100000L);
#else
- if (nPtr->NeoMMIOBase2)
- pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoMMIOBase2, 0x100000L);
+ if (nPtr->NeoMMIOBase2)
+ pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoMMIOBase2, 0x100000L);
#endif
- nPtr->NeoMMIOBase2 = NULL;
+ nPtr->NeoMMIOBase2 = NULL;
#ifndef XSERVER_LIBPCIACCESS
- xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoFbBase,
- nPtr->NeoFbMapSize);
+ xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoFbBase,
+ nPtr->NeoFbMapSize);
#else
- pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoFbBase, nPtr->NeoFbMapSize);
+ pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoFbBase, nPtr->NeoFbMapSize);
#endif
- }
nPtr->NeoFbBase = NULL;
return TRUE;
@@ -2705,8 +2647,7 @@ neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
/* If they are used, enable linear addressing and/or enable MMIO. */
NeoNew->SysIfaceCntl2 = 0x00;
- if (!nPtr->noLinear)
- NeoNew->SysIfaceCntl2 |= 0x80;
+ NeoNew->SysIfaceCntl2 |= 0x80;
if (!nPtr->noMMIO)
NeoNew->SysIfaceCntl2 |= 0x40;
diff --git a/src/neo_video.c b/src/neo_video.c
index dd02839..a9e1e25 100644
--- a/src/neo_video.c
+++ b/src/neo_video.c
@@ -87,7 +87,6 @@ NEOInitVideo(ScreenPtr pScreen)
numAdaptors = xf86XVListGenericAdaptors(pScrn, &overlayAdaptors);
if (nPtr->NeoChipset > NM2070
- && !nPtr->noLinear
&& nPtr->NeoMMIOBase2 != NULL){
nPtr->video = TRUE;
newAdaptor = NEOSetupVideo(pScreen);
commit b6633ee77513ccb99a2301e3d3625688c842ce7b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 30 12:17:52 2009 -0500
Remove old DGA header stanza
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/neo_driver.c b/src/neo_driver.c
index e4c60f2..f853107 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -109,10 +109,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/Xproto.h>
#include "scrnintstr.h"
#include "servermd.h"
-#ifdef XFreeXDGA
-#define _XF86DGA_SERVER_
-#include <X11/extensions/xf86dgastr.h>
-#endif
#include <unistd.h>
commit eb2b36e969964312afa16e01aa874b52256a3ea9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 23 09:25:05 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index 0948d13..32ab98a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
SUBDIRS = src man
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = NM-reg.txt TODO
commit b28cb14da7e09f0a170a65624242d6112be1ce99
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:41:41 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Automake 'foreign' option is specified in configure.ac.
Remove from Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 0e65e3d..0948d13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@
# 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.
-AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
EXTRA_DIST = NM-reg.txt TODO
commit c094377f59080145744b9299f89e290dbd99e37e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:09 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/Makefile.am b/Makefile.am
index 70c152c..0e65e3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,9 +23,12 @@ SUBDIRS = src man
EXTRA_DIST = NM-reg.txt TODO
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index 6828de3..358c0dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit f34c1b10cce4919533db164212fd4bf166f8be5d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 12:54:21 2009 -0400
Several driver modules do not have a ChangeLog target in Makefile.am #23814
The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 4ddb38c..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,73 +0,0 @@
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/neo_driver.c:
- Bump to 1.1.1 for Xv changes.
-
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
-
- * src/neo_video.c: (NEOPutVideo), (NEOPutImage):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
-
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/neo.h:
- * src/neo_2070.c:
- * src/neo_2090.c:
- * src/neo_2097.c:
- * src/neo_2200.c:
- * src/neo_bank.c:
- * src/neo_cursor.c:
- * src/neo_dga.c:
- * src/neo_driver.c:
- * src/neo_i2c.c:
- * src/neo_shadow.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Add check for DGA extension to fix issues when building with
- separate build roots.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 307be04..70c152c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,3 +23,9 @@ SUBDIRS = src man
EXTRA_DIST = NM-reg.txt TODO
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 02bba42..6828de3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -90,9 +96,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=neomagic
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([
Makefile
src/Makefile
commit 8f4212f3cef01e591172ba16c745996fe98f5e29
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:17 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/.gitignore b/.gitignore
index 2df4a8d..22b7b03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,78 @@
Reply to: