xserver-xorg-video-apm: Changes to 'upstream-unstable'
.gitignore | 70 -
COPYING | 49 +++
ChangeLog| 67 -
Makefile.am | 14 -
README | 261 +++
README.sgml | 122 -
configure.ac | 78 +
man/.cvsignore |2
man/Makefile.am | 59 +---
man/apm.man |4
src/.cvsignore |6
src/Makefile.am | 10
src/apm.h| 14 -
src/apm_accel.c | 493 +++-
src/apm_dga.c| 16 -
src/apm_driver.c | 379 ++--
src/apm_funcs.c | 38 --
src/apm_rush.c | 733 ---
src/apm_video.c |9
19 files changed, 551 insertions(+), 1873 deletions(-)
New commits:
commit 21f5f7acf9235428ef2bcd5e34d0a44f9e4d838b
Author: Adam Jackson a...@redhat.com
Date: Mon Dec 19 17:44:20 2011 -0500
Fix for new vgaHW ABI
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/apm_driver.c b/src/apm_driver.c
index 2471478..078d443 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -417,6 +417,7 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
hwp = VGAHWPTR(pScrn);
+vgaHWSetStdFuncs(hwp);
vgaHWGetIOBase(hwp);
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 12
#define PIOOFFSET hwp-PIOOffset
commit f66da557eb7773856081bda2465973dfabf3eaa0
Author: Adam Jackson a...@redhat.com
Date: Mon Dec 19 16:09:34 2011 -0500
Fall back to shadowfb if XAA fails to load
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/apm_driver.c b/src/apm_driver.c
index 4e548a4..2471478 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -992,8 +992,9 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
/* Load XAA if needed */
if (!pApm-NoAccel) {
if (!xf86LoadSubModule(pScrn, xaa)) {
- ApmFreeRec(pScrn);
- return FALSE;
+ xf86DrvMsg(pScrn-scrnIndex, X_INFO, Falling back to shadowfb\n);
+ pApm-NoAccel = TRUE;
+ pApm-ShadowFB = TRUE;
}
}
commit 967f6f20670baa33506c3c1b107260a4f909f3d6
Author: Adam Jackson a...@redhat.com
Date: Thu Nov 17 15:50:02 2011 -0500
Check ABI major not encoded ABI
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/apm_driver.c b/src/apm_driver.c
index f77bb2b..8d6f486 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -418,7 +418,7 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
hwp = VGAHWPTR(pScrn);
vgaHWGetIOBase(hwp);
-#if ABI_VIDEODRV_VERSION 12
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 12
#define PIOOFFSET hwp-PIOOffset
#else
/* FIXME reintroduce domain support */
commit 6b195cc0273650d01fc20c26433b929e9683aa5f
Author: Adam Jackson a...@redhat.com
Date: Wed Nov 16 13:02:14 2011 -0500
Adapt to vgahw changes in videoabi 12
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/apm_driver.c b/src/apm_driver.c
index f172bab..f77bb2b 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -418,8 +418,14 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
hwp = VGAHWPTR(pScrn);
vgaHWGetIOBase(hwp);
-pApm-iobase = hwp-PIOOffset;
-pApm-xport = hwp-PIOOffset + 0x3C4;
+#if ABI_VIDEODRV_VERSION 12
+#define PIOOFFSET hwp-PIOOffset
+#else
+/* FIXME reintroduce domain support */
+#define PIOOFFSET 0
+#endif
+pApm-iobase = PIOOFFSET;
+pApm-xport = PIOOFFSET + 0x3C4;
/* Set pScrn-monitor */
pScrn-monitor = pScrn-confScreen-monitor;
commit 9ce6499f013a5b6fdc9440fd3213dbb28b3bf1be
Author: Adam Jackson a...@redhat.com
Date: Wed Nov 16 12:59:00 2011 -0500
s/IOADDRESS/unsigned long/
Signed-off-by: Adam Jackson a...@redhat.com
diff --git a/src/apm.h b/src/apm.h
index bc66714..86c7663 100644
--- a/src/apm.h
+++ b/src/apm.h
@@ -109,7 +109,7 @@ typedef struct {
char *MemMap;
pointerBltMap;
Bool UnlockCalled;
-IOADDRESS iobase, xport, xbase;
+unsigned long iobase, xport, xbase;
unsigned char savedSR10;
CARD8 MiscOut;
CARD8 c9, d9, db, Rush;
commit 6f8a776f792c02779a34c911f803fde8c09b93f6
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date: Wed Jul 28 07:42:30 2010 -0700
Add XFree86 Copyright/License to COPYING for all code that came from XF86
4.4
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
diff --git a/COPYING b/COPYING
index 340a7ec..65af997 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,27 @@
+Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
+
+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
xserver-xorg-video-apm: Changes to 'upstream-unstable'
configure.ac |6 ++
man/apm.man |2
src/apm_driver.c | 131 ---
3 files changed, 17 insertions(+), 122 deletions(-)
New commits:
commit ec3e90e90b6e1c30122056466593bc53496773b4
Author: Dave Airlie airl...@redhat.com
Date: Thu Jul 30 11:20:31 2009 +1000
apm: bump for 1.2.2 release
diff --git a/configure.ac b/configure.ac
index 5d76327..d082040 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-apm],
-1.2.1,
+1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-apm)
commit 457f84f373b33838355dbb059892c118bed51409
Author: Dave Airlie airl...@redhat.com
Date: Thu Jul 30 11:19:35 2009 +1000
apm: fix up ABI properly
diff --git a/src/apm_driver.c b/src/apm_driver.c
index 3939dac..8dc3b3e 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -6,6 +6,10 @@
#include apm.h
#include xf86cmap.h
#include shadowfb.h
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 6
+#include xf86Resources.h
+#include xf86RAC.h
+#endif
#include xf86int10.h
#include vbe.h
@@ -786,6 +790,15 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
xf86FreeInt10(ptr);
}
+#ifndef XSERVER_LIBPCIACCESS
+xf86RegisterResources(pEnt-index, NULL, ResNone);
+xf86SetOperatingState(resVga, pEnt-index, ResDisableOpr);
+pScrn-racMemFlags = 0;/* For noLinear, access to 0xA */
+if (pApm-VGAMap)
+ pScrn-racIoFlags = 0;
+else
+ pScrn-racIoFlags = RAC_COLORMAP | RAC_VIEWPORT;
+#endif
if (pEnt-device-videoRam != 0) {
pScrn-videoRam = pEnt-device-videoRam;
from = X_CONFIG;
commit c2d90960dcd57b1380266188ca7155e981b50bb9
Author: Dave Airlie airl...@redhat.com
Date: Tue Jul 28 13:32:28 2009 +1000
apm: update for resources/RAC API removal
diff --git a/src/apm_driver.c b/src/apm_driver.c
index f9420a3..3939dac 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -6,9 +6,7 @@
#include apm.h
#include xf86cmap.h
#include shadowfb.h
-#include xf86Resources.h
#include xf86int10.h
-#include xf86RAC.h
#include vbe.h
#include opaque.h
@@ -788,14 +786,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
xf86FreeInt10(ptr);
}
-xf86RegisterResources(pEnt-index, NULL, ResNone);
-xf86SetOperatingState(resVga, pEnt-index, ResDisableOpr);
-pScrn-racMemFlags = 0;/* For noLinear, access to 0xA */
-if (pApm-VGAMap)
- pScrn-racIoFlags = 0;
-else
- pScrn-racIoFlags = RAC_COLORMAP | RAC_VIEWPORT;
-
if (pEnt-device-videoRam != 0) {
pScrn-videoRam = pEnt-device-videoRam;
from = X_CONFIG;
commit 09347dfc78b7f291313057863976bf4b679362d1
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Thu Jul 16 11:26:14 2009 +1000
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/configure.ac b/configure.ac
index b15f61e..5d76327 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server = 1.0.99.901] xproto fontsproto
$REQUIRED_MODULES)
+PKG_CHECK_MODULES(XEXT, [xextproto = 7.0.99.1],
+ HAVE_XEXTPROTO_71=yes; AC_DEFINE(HAVE_XEXTPROTO_71, 1,
[xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71=no)
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test $HAVE_XEXTPROTO_71 = yes ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
PKG_CHECK_MODULES(XF86RUSH, xxf86rush, have_xf86rush=yes, have_xf86rush=no)
diff --git a/src/apm_driver.c b/src/apm_driver.c
index 98c02d1..f9420a3 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -12,8 +12,13 @@
#include vbe.h
#include opaque.h
+#ifdef HAVE_XEXTPROTO_71
+#include X11/extensions/dpmsconst.h
+#else
#define DPMS_SERVER
#include X11/extensions/dpms.h
+#endif
+
#define APM_VERSION4000
#define APM_NAME APM
commit f985346aef9c15eaa1669ab8317e5e470eb143dc
Author: Adam Jackson a...@redhat.com
Date: Thu May 28 14:41:37 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/apm_driver.c b/src/apm_driver.c
index 0166f41..98c02d1 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -134,102 +134,6 @@ static const OptionInfoRec ApmOptions[] =
{0}, FALSE}
};
-/*
- * List of symbols from other modules that this module references. This
- * list is used to tell the loader that it is OK for symbols here to be
- * unresolved providing that it hasn't been told that they haven't been
- * told that they are essential via a call to xf86LoaderReqSymbols() or
- * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
- * unresolved symbols that are not required.
- */
-
xserver-xorg-video-apm: Changes to 'upstream-unstable'
configure.ac | 10 +-
src/apm.h|5 ++---
src/apm_driver.c | 18 +++---
src/apm_rush.c |6 +++---
4 files changed, 29 insertions(+), 10 deletions(-)
New commits:
commit aa1df17848f6238def86a41eadb662b4480ee762
Author: Dave Airlie airl...@redhat.com
Date: Mon Dec 22 14:12:50 2008 +1000
apm 1.2.1
diff --git a/configure.ac b/configure.ac
index d8ca647..b15f61e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-apm],
-1.2.0,
+1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-apm)
commit ba440693cb40cb6eb414bbad86fea8d444bd0cac
Author: Adam Jackson a...@redhat.com
Date: Fri Dec 19 10:18:44 2008 -0500
Stop using XVCALL macro
diff --git a/src/apm_rush.c b/src/apm_rush.c
index 74d85a3..47645d6 100644
--- a/src/apm_rush.c
+++ b/src/apm_rush.c
@@ -569,7 +569,7 @@ ProcXF86RushOverlayPixmap(ClientPtr client)
return (BadMatch);
}
-status = XVCALL(diMatchPort)(pPort, pDraw);
+status = XvdiMatchPort(pPort, pDraw);
if (status != Success)
return status;
@@ -580,7 +580,7 @@ ProcXF86RushOverlayPixmap(ClientPtr client)
client-errorValue = stuff-pixmap;
return (BadPixmap);
}
-status = XVCALL(diMatchPort)(pPort, (DrawablePtr)pPixmap);
+status = XvdiMatchPort(pPort, (DrawablePtr)pPixmap);
if (status != Success)
return status;
pPriv = APM_GET_PIXMAP_PRIVATE(pPixmap);
@@ -604,7 +604,7 @@ ProcXF86RushOverlayPixmap(ClientPtr client)
return BadMatch;
pApm-PutImageStride = pPixmap-devKind;
-status = XVCALL(diPutImage)(client, pDraw, pPort, pGC,
+status = XvdiPutImage(client, pDraw, pPort, pGC,
stuff-src_x, stuff-src_y,
stuff-src_w, stuff-src_h,
stuff-drw_x, stuff-drw_y,
commit c0a4a2528dbaba95fec181552ccb0f00e1ede2ea
Author: Adam Jackson a...@redhat.com
Date: Sun Nov 23 17:50:37 2008 -0500
Make ISA optional
diff --git a/configure.ac b/configure.ac
index 9363fca..d8ca647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,14 @@ INCLUDES=$XORG_INCS -I${sdkdir} $XF86RUSH_INCS
'-I$(top_srcdir)/src -I$(prefix
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
+save_CFLAGS=$CFLAGS
+CFLAGS=$XORG_CFLAGS
+AC_CHECK_DECL(xf86ConfigIsaEntity,
+ [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])],
+ [],
+ [#include xf86.h])
+CFLAGS=$save_CFLAGS
+
# Checks for libraries.
SAVE_CPPFLAGS=$CPPFLAGS
CPPFLAGS=$CPPFLAGS $XORG_CFLAGS
diff --git a/src/apm_driver.c b/src/apm_driver.c
index 443c191..cbb2f43 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -82,10 +82,12 @@ static PciChipsets ApmPciChipsets[] = {
{ -1, -1, RES_UNDEFINED }
};
+#ifdef HAVE_ISA
static IsaChipsets ApmIsaChipsets[] = {
{ PCI_CHIP_AP6422, RES_EXCLUSIVE_VGA},
{-1, RES_UNDEFINED}
};
+#endif
typedef enum {
OPTION_SET_MCLK,
@@ -328,6 +330,7 @@ ApmAvailableOptions(int chipid, int busid)
return ApmOptions;
}
+#ifdef HAVE_ISA
static int
ApmFindIsaDevice(GDevPtr dev)
{
@@ -376,6 +379,7 @@ ApmFindIsaDevice(GDevPtr dev)
return apmChip;
}
+#endif
static void
ApmAssignFPtr(ScrnInfoPtr pScrn)
@@ -447,6 +451,7 @@ ApmProbe(DriverPtr drv, int flags)
}
}
+#ifdef HAVE_ISA
/* Check for non-PCI cards */
numUsed = xf86MatchIsaInstances(APM_NAME, ApmChipsets,
ApmIsaChipsets, drv, ApmFindIsaDevice, DevSections,
@@ -467,6 +472,8 @@ ApmProbe(DriverPtr drv, int flags)
}
}
}
+#endif
+
xfree(DevSections);
return foundScreen;
}
commit 33edd3514fbfbd8b36a8568dbe021d0df99e6743
Author: Adam Jackson a...@redhat.com
Date: Fri Aug 15 15:20:16 2008 -0400
Actually use the DDC results we get.
diff --git a/src/apm_driver.c b/src/apm_driver.c
index 9106d1f..443c191 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -975,8 +975,10 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
}
if (0 !MonInfo)
MonInfo =
xf86DoEDID_DDC1(pScrn-scrnIndex,vgaHWddc1SetSpeed,ddc1Read);
- if (MonInfo)
+ if (MonInfo) {
xf86PrintEDID(MonInfo);
+ xf86SetDDCproperties(pScrn, MonInfo);
+ }
pScrn-monitor-DDC = MonInfo;
}
commit 51ac7b1d182730ab1b9aaac412ac6cc40904bce3
Author: Adam Jackson a...@redhat.com
Date: Fri Aug 15 13:58:29 2008 -0400
Uninclude xf86Version.h
diff --git a/src/apm.h b/src/apm.h
index 7c0bfda..c57e9ba 100644
--- a/src/apm.h
+++ b/src/apm.h
@@ -11,9 +11,6 @@
/* Everything using inb/outb, etc needs compiler.h */
#include compiler.h
-/* This is used for module versioning */
-#include xf86Version.h
-
/* Drivers for PCI hardware need this */
#include xf86PciInfo.h
commit 230858d8b3dfc18098cb89cdee3599714ac95375
Author:
xserver-xorg-video-apm: Changes to 'upstream-unstable'
configure.ac| 15 +-
man/Makefile.am |1
src/Makefile.am |3 -
src/apm.h | 10 +++-
src/apm_accel.c |1
src/apm_cursor.c|1
src/apm_dga.c |1
src/apm_driver.c| 74 +++
src/apm_funcs.c |1
src/apm_i2c.c |1
src/apm_pcirename.h | 122
src/apm_regs.h |1
src/apm_rush.c |2
src/apm_video.c |1
14 files changed, 211 insertions(+), 23 deletions(-)
New commits:
commit 3cbb51c4a94b1d19cdc5b9542449281cc0952356
Author: Adam Jackson [EMAIL PROTECTED]
Date: Wed Mar 19 12:10:48 2008 -0400
apm 1.2.0
diff --git a/configure.ac b/configure.ac
index 851373a..9363fca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-apm],
-1.1.1,
+1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-apm)
commit 6c374fadd3b81a6d58c4f5d361d957c85cab1d4a
Author: Adam Jackson [EMAIL PROTECTED]
Date: Wed Mar 19 11:05:14 2008 -0400
Death to RCS tags.
diff --git a/src/apm.h b/src/apm.h
index 97b02ac..3d500c3 100644
--- a/src/apm.h
+++ b/src/apm.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h,v 1.19tsi Exp $
*/
#include apm_pcirename.h
#include string.h
diff --git a/src/apm_accel.c b/src/apm_accel.c
index 4a7a149..4526097 100644
--- a/src/apm_accel.c
+++ b/src/apm_accel.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c,v 1.20tsi
Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
diff --git a/src/apm_cursor.c b/src/apm_cursor.c
index 14dbc62..3638cf2 100644
--- a/src/apm_cursor.c
+++ b/src/apm_cursor.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.14
2000/06/30 18:27:02 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
diff --git a/src/apm_dga.c b/src/apm_dga.c
index 152e91b..313d03b 100644
--- a/src/apm_dga.c
+++ b/src/apm_dga.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_dga.c,v 1.9
2001/01/06 21:29:11 tsi Exp $ */
/*
* file: apm_dga.c
* ported from s3virge, ported from mga
diff --git a/src/apm_driver.c b/src/apm_driver.c
index 9e4603a..49b74d3 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c,v 1.65
2003/10/30 17:36:57 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
diff --git a/src/apm_funcs.c b/src/apm_funcs.c
index 78e5bf7..01d50c3 100644
--- a/src/apm_funcs.c
+++ b/src/apm_funcs.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c,v 1.18tsi
Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
diff --git a/src/apm_i2c.c b/src/apm_i2c.c
index a452c32..b0691a1 100644
--- a/src/apm_i2c.c
+++ b/src/apm_i2c.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c,v 1.6.4.1
2001/11/28 22:35:13 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
diff --git a/src/apm_regs.h b/src/apm_regs.h
index 633a1eb..3f60eef 100644
--- a/src/apm_regs.h
+++ b/src/apm_regs.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_regs.h,v 1.8
2002/01/25 21:55:55 tsi Exp $ */
diff --git a/src/apm_rush.c b/src/apm_rush.c
index 61c066a..74d85a3 100644
--- a/src/apm_rush.c
+++ b/src/apm_rush.c
@@ -1,5 +1,3 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.4
2005/04/20 12:25:22 daniels Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.11tsi
Exp $ */
/*
* Copyright Loïc Grenié 1999
*/
diff --git a/src/apm_video.c b/src/apm_video.c
index acf65da..9a9bc39 100644
--- a/src/apm_video.c
+++ b/src/apm_video.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c,v 1.11tsi
Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
commit 9c5bd06addbd5470c891760b1ba84c27eddeecad
Author: Dave Airlie [EMAIL PROTECTED]
Date: Tue Mar 11 10:50:32 2008 +1000
further build fixes
diff --git a/src/apm.h b/src/apm.h
index 1f616eb..97b02ac 100644
--- a/src/apm.h
+++ b/src/apm.h
@@ -128,7 +128,7 @@ typedef struct {
unsigned char savedSR10;
CARD8 MiscOut;
CARD8 c9, d9, db, Rush;
-unsigned long saveCmd;
+unsigned int saveCmd;
pointerFontInfo;
Bool hwCursor;
Bool noLinear;
diff --git a/src/apm_driver.c b/src/apm_driver.c
index b5b5874..9e4603a 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -415,9 +415,11 @@ ApmProbe(DriverPtr drv, int flags)
* file info to override any contradictions.
*/
+#ifndef XSERVER_LIBPCIACCESS
if (xf86GetPciVideoInfo() == NULL) {
return FALSE;
}
+#endif
numUsed = xf86MatchPciInstances(APM_NAME, PCI_VENDOR_ALLIANCE,
xserver-xorg-video-apm: Changes to 'upstream-unstable'
.cvsignore | 19 --- .gitignore | 20 man/apm.man |6 +++--- src/apm_cursor.c |1 - 4 files changed, 23 insertions(+), 23 deletions(-) New commits: commit 5c471bae5933a3e915d8aba2dbf7c4f68c3086b7 Author: Adam Jackson [EMAIL PROTECTED] Date: Thu Mar 1 17:46:28 2007 -0500 Remove useless mfb.h include. diff --git a/src/apm_cursor.c b/src/apm_cursor.c index ea21ac2..14dbc62 100644 --- a/src/apm_cursor.c +++ b/src/apm_cursor.c @@ -13,7 +13,6 @@ #include scrnintstr.h #include servermd.h #include windowstr.h -#include mfb.h #include mipointer.h #include apm.h commit 3419d02714e4d10fa267b427af012de81c447a23 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Thu Mar 1 10:40:39 2007 -0800 renamed: .cvsignore - .gitignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index fb1befd..000 --- a/.cvsignore +++ /dev/null @@ -1,19 +0,0 @@ -Makefile -Makefile.in -*.la -*.lo -aclocal.m4 -autom4te.cache -config.guess -config.h -config.h.in -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -missing -stamp-h1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..2df4a8d --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +Makefile +Makefile.in +*.la +*.lo +aclocal.m4 +autom4te.cache +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +depcomp +install-sh +libtool +ltmain.sh +missing +stamp-h1 +*~ commit a56ca8d06b4286d8c4e4188e6056eff00a2209f5 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Thu Mar 1 10:40:15 2007 -0800 Replace references to XFree86/XF86Config in man page diff --git a/man/apm.man b/man/apm.man index cb206c1..739c658 100644 --- a/man/apm.man +++ b/man/apm.man @@ -14,7 +14,7 @@ apm \- Alliance ProMotion video driver .fi .SH DESCRIPTION .B apm -is an XFree86 driver for Alliance ProMotion video cards. The driver +is an __xservername__ driver for Alliance ProMotion video cards. The driver is accelerated for supported hardware/depth combination. It supports framebuffer depths of 8, 15, 16, 24 and 32 bits. For 6420, 6422, AT24, AT3D and AT25, all depths are fully accelerated except 24 bpp for which @@ -35,7 +35,7 @@ ProMotion chipsets .TP 12 .B AT25 .SH CONFIGURATION DETAILS -Please refer to XF86Config(__filemansuffix__) for general configuration +Please refer to __xconfigfile__(__filemansuffix__) for general configuration details. This section only covers configuration details specific to this driver. .PP @@ -101,6 +101,6 @@ Force the software cursor. Default: off. .BI Option \*qShadowFB\*q \*q boolean \*q Enable or disable use of the shadow framebuffer layer. Default: off. .SH SEE ALSO -XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) +__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__) .SH AUTHORS Authors include: ... -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-video-apm: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 03e919c17ff7981bc2d8d03eaf0955adbb03a7b0 Author: Eamon Walsh [EMAIL PROTECTED] Date: Thu Dec 14 14:41:11 2006 -0500 Naming change: Security*Access - Dix*Access commit 392b8d45b08b9e87facb7f23cb2226fcd5062425 Author: Adam Jackson [EMAIL PROTECTED] Date: Sat Apr 8 01:14:51 2006 + Bump to 1.1.1 for Xv changes. commit 8f9172e2814b98b58fcc2e57cde720e10477b9c1 Author: Aaron Plattner [EMAIL PROTECTED] Date: Fri Apr 7 23:04:59 2006 + Add a DrawablePtr argument to the XV functions to pave the way for redirected video. commit 8541e7775e75cd6ce0fb69ddb8922b6032489441 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 18:55:04 2006 + Fix a missed VERSION - APM_VERSION. commit cdfc8e010e230763250eb8b57d0106d20cf40080 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 18:34:37 2006 + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. commit bf98a33803e6c74f6b0015add1271e7f843e5ac6 Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Dec 26 18:18:04 2005 + Bug #5356: Don't redefine VERSION. (Tilman Sauerbeck) commit 25ac65dfd98ff8dcb948b07d8ca4e8124e40bf60 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Dec 21 02:29:59 2005 + Update package version for X11R7 release. commit a4e41512842d5a91fa80e7ae5f071a156a538d9e Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Dec 19 16:25:52 2005 + Stub COPYING files commit 8f2f41847a4cfdca3ab3c166941780c9b83a3db0 Author: Kevin E Martin [EMAIL PROTECTED] Date: Thu Dec 15 00:24:16 2005 + Update package version number for final X11R7 release candidate. commit 16ca24864892502829c37118d81c3bf9d7564069 Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Dec 6 22:48:33 2005 + Change *man_SOURCES == *man_PRE to fix autotools warnings. commit cab75d09cb977e9b946f1067c9e98e206c0e7d23 Author: Kevin E Martin [EMAIL PROTECTED] Date: Sat Dec 3 05:49:32 2005 + Update package version number for X11R7 RC3 release. commit d05d3cafeafbdb667706290b0a7bbc9eb4a38a8e Author: Kevin E Martin [EMAIL PROTECTED] Date: Fri Dec 2 02:16:07 2005 + Remove extraneous AC_MSG_RESULT. commit 4775074a27eae9c379c0e26b226811f0f1fdb1e0 Author: Adam Jackson [EMAIL PROTECTED] Date: Tue Nov 29 23:29:57 2005 + Only build dlloader modules by default. commit ce3092b8cdff25d771765fd64d391b56017b5735 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Nov 28 22:04:08 2005 + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) commit c63cfdbe97d19ea664f23dda7fe07627325649ae Author: Eric Anholt [EMAIL PROTECTED] Date: Mon Nov 21 10:49:09 2005 + Add .cvsignores for drivers. commit 459f7490f879ee4e7232e4653ce3f4cd03d04eb2 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Nov 9 21:15:14 2005 + Update package version number for X11R7 RC2 release. commit 88d85d65fa2aeef87a03019dbe87bf4ff7b0c3ed Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Nov 1 15:08:52 2005 + Update pkgcheck depedencies to work with separate build roots. commit 49db1e530eb8df10b2ac64b3cc9f7d368d09dc04 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Oct 19 02:48:02 2005 + Update package version number for RC1 release. commit e0feaa362f56ac5f82baaee90d0a5886e1e8efa9 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Oct 19 02:46:56 2005 + lib/Xcomposite/Xcomposite.h lib/Xft/Imakefile lib/Xft/Xft.h Update library version numbers to match updated package versions. Update driver version numbers for RC1. commit 4660df3bf81e1da5beb3a32da7941ad880f1626c Author: Alan Coopersmith [EMAIL PROTECTED] Date: Tue Oct 18 00:01:52 2005 + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro substitutions to work better with BSD make commit 1613d814b235f849fb2ddc8655a25f02bbc3dda0 Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Oct 17 22:57:32 2005 + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead of indirectly commit a7990a8eb38e547ef6f277b6f8a55fd653649424 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Oct 17 00:09:01 2005 + Use sed cpp to substitute variables in driver man pages commit 3134bbad0f248868ba3cfeae8b5afe3c295d7aa2 Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Tue Oct 4 20:01:03 2005 + Check in generated README files commit 7b90aace06d6e4abaf81073f49604f5068a60ee8 Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Mon Oct 3 21:22:06 2005 + - For all drivers that have a driver.sgml file, add code in their build system to build the README file at make dist time - in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that will check if the required tools and files
xserver-xorg-video-apm: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 03e919c17ff7981bc2d8d03eaf0955adbb03a7b0 Author: Eamon Walsh [EMAIL PROTECTED] Date: Thu Dec 14 14:41:11 2006 -0500 Naming change: Security*Access - Dix*Access commit 392b8d45b08b9e87facb7f23cb2226fcd5062425 Author: Adam Jackson [EMAIL PROTECTED] Date: Sat Apr 8 01:14:51 2006 + Bump to 1.1.1 for Xv changes. commit 8f9172e2814b98b58fcc2e57cde720e10477b9c1 Author: Aaron Plattner [EMAIL PROTECTED] Date: Fri Apr 7 23:04:59 2006 + Add a DrawablePtr argument to the XV functions to pave the way for redirected video. commit 8541e7775e75cd6ce0fb69ddb8922b6032489441 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 18:55:04 2006 + Fix a missed VERSION - APM_VERSION. commit cdfc8e010e230763250eb8b57d0106d20cf40080 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 18:34:37 2006 + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. commit bf98a33803e6c74f6b0015add1271e7f843e5ac6 Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Dec 26 18:18:04 2005 + Bug #5356: Don't redefine VERSION. (Tilman Sauerbeck) commit 25ac65dfd98ff8dcb948b07d8ca4e8124e40bf60 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Dec 21 02:29:59 2005 + Update package version for X11R7 release. commit a4e41512842d5a91fa80e7ae5f071a156a538d9e Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Dec 19 16:25:52 2005 + Stub COPYING files commit 8f2f41847a4cfdca3ab3c166941780c9b83a3db0 Author: Kevin E Martin [EMAIL PROTECTED] Date: Thu Dec 15 00:24:16 2005 + Update package version number for final X11R7 release candidate. commit 16ca24864892502829c37118d81c3bf9d7564069 Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Dec 6 22:48:33 2005 + Change *man_SOURCES == *man_PRE to fix autotools warnings. commit cab75d09cb977e9b946f1067c9e98e206c0e7d23 Author: Kevin E Martin [EMAIL PROTECTED] Date: Sat Dec 3 05:49:32 2005 + Update package version number for X11R7 RC3 release. commit d05d3cafeafbdb667706290b0a7bbc9eb4a38a8e Author: Kevin E Martin [EMAIL PROTECTED] Date: Fri Dec 2 02:16:07 2005 + Remove extraneous AC_MSG_RESULT. commit 4775074a27eae9c379c0e26b226811f0f1fdb1e0 Author: Adam Jackson [EMAIL PROTECTED] Date: Tue Nov 29 23:29:57 2005 + Only build dlloader modules by default. commit ce3092b8cdff25d771765fd64d391b56017b5735 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Nov 28 22:04:08 2005 + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) commit c63cfdbe97d19ea664f23dda7fe07627325649ae Author: Eric Anholt [EMAIL PROTECTED] Date: Mon Nov 21 10:49:09 2005 + Add .cvsignores for drivers. commit 459f7490f879ee4e7232e4653ce3f4cd03d04eb2 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Nov 9 21:15:14 2005 + Update package version number for X11R7 RC2 release. commit 88d85d65fa2aeef87a03019dbe87bf4ff7b0c3ed Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Nov 1 15:08:52 2005 + Update pkgcheck depedencies to work with separate build roots. commit 49db1e530eb8df10b2ac64b3cc9f7d368d09dc04 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Oct 19 02:48:02 2005 + Update package version number for RC1 release. commit e0feaa362f56ac5f82baaee90d0a5886e1e8efa9 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Oct 19 02:46:56 2005 + lib/Xcomposite/Xcomposite.h lib/Xft/Imakefile lib/Xft/Xft.h Update library version numbers to match updated package versions. Update driver version numbers for RC1. commit 4660df3bf81e1da5beb3a32da7941ad880f1626c Author: Alan Coopersmith [EMAIL PROTECTED] Date: Tue Oct 18 00:01:52 2005 + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro substitutions to work better with BSD make commit 1613d814b235f849fb2ddc8655a25f02bbc3dda0 Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Oct 17 22:57:32 2005 + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead of indirectly commit a7990a8eb38e547ef6f277b6f8a55fd653649424 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Oct 17 00:09:01 2005 + Use sed cpp to substitute variables in driver man pages commit 3134bbad0f248868ba3cfeae8b5afe3c295d7aa2 Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Tue Oct 4 20:01:03 2005 + Check in generated README files commit 7b90aace06d6e4abaf81073f49604f5068a60ee8 Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Mon Oct 3 21:22:06 2005 + - For all drivers that have a driver.sgml file, add code in their build system to build the README file at make dist time - in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that will check if the required tools and files
xserver-xorg-video-apm: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 190e38f513ed645b1662441a4b90eaf778878316 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 16:16:33 2006 + Bump to 1.1.0. commit a128e04d9240409cf8c9a9c92671f374959c60d0 Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 16:13:56 2006 + Unlibcwrap and bump server version requirement. commit aaec49a8e42193e0d7f68132f01e8d802ecee27c Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Dec 21 02:29:55 2005 + Update package version for X11R7 release. commit e5dd84c88172873a99f12798cc00e59c5185afc7 Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Dec 19 16:25:49 2005 + Stub COPYING files commit 2e050d849b72a5119790641fe6b7a83f5e6f15f0 Author: Kevin E Martin [EMAIL PROTECTED] Date: Thu Dec 15 00:24:13 2005 + Update package version number for final X11R7 release candidate. commit 8df008ad5451a0afc4576be121e112ae43c5a4bf Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Dec 6 22:48:27 2005 + Change *man_SOURCES == *man_PRE to fix autotools warnings. commit a3e290213ce7ce920145a4a7368e052f09768164 Author: Kevin E Martin [EMAIL PROTECTED] Date: Sat Dec 3 05:49:29 2005 + Update package version number for X11R7 RC3 release. commit 31963eae0d36ca43f103a885430b39626021aa94 Author: Kevin E Martin [EMAIL PROTECTED] Date: Fri Dec 2 02:16:04 2005 + Remove extraneous AC_MSG_RESULT. commit 295f696a950f0883c040969a7381be1b16275674 Author: Adam Jackson [EMAIL PROTECTED] Date: Tue Nov 29 23:29:53 2005 + Only build dlloader modules by default. commit b8075ef13db08347876dd74b06bd5d05be00d9ff Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Nov 28 22:04:05 2005 + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) commit cab1f00c4f2d2b2a12260c078b06a30bd03b8d35 Author: Eric Anholt [EMAIL PROTECTED] Date: Mon Nov 21 10:49:00 2005 + Add .cvsignores for drivers. commit 9f164337b4c0ff7f3189f50033f5635550fbe598 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Nov 9 21:15:10 2005 + Update package version number for X11R7 RC2 release. commit 37f29b066c955b9ef85b95f39ed4ca9c4c799da9 Author: Kevin E Martin [EMAIL PROTECTED] Date: Tue Nov 1 15:08:48 2005 + Update pkgcheck depedencies to work with separate build roots. commit 0d5c65828cbda96688234ca98de51748cc6a7a9c Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Oct 19 02:47:59 2005 + Update package version number for RC1 release. commit 48e99a4438d6e4c869cae23f2bcf17504b36f12b Author: Alan Coopersmith [EMAIL PROTECTED] Date: Tue Oct 18 00:01:50 2005 + Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro substitutions to work better with BSD make commit 9cd8523d3047eb00e9d1f90158d932c8c9c8d511 Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Oct 17 22:57:25 2005 + More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead of indirectly commit 33d7ef77bdc4d55c01f50f9a29ac660703c0e380 Author: Alan Coopersmith [EMAIL PROTECTED] Date: Mon Oct 17 00:08:53 2005 + Use sed cpp to substitute variables in driver man pages commit 262151fd3f961ee1dc065943eff62e7c27823340 Author: Daniel Stone [EMAIL PROTECTED] Date: Thu Aug 18 09:03:36 2005 + Update autogen.sh to one that does objdir != srcdir. commit 3e83d76e4315468df9c85b7a917508e5e0adc8e6 Author: Søren Sandmann Pedersen [EMAIL PROTECTED] Date: Wed Aug 10 14:07:21 2005 + Don\'t lose existing CFLAGS in all the input drivers and some of the video drivers commit 81612155b583e3fbaff7af662edf7353cfb0da8e Author: Kevin E Martin [EMAIL PROTECTED] Date: Fri Jul 29 21:22:39 2005 + Various changes preparing packages for RC0: - Verify and update package version numbers as needed - Implement versioning scheme - Change bug address to point to bugzilla bug entry form - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to reenable it) - Fix makedepend to use pkgconfig and pass distcheck - Update build script to build macros first - Update modular Xorg version commit 01f7b4b23a52439aab8262d3a500f3339be04eb3 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Jul 13 20:03:20 2005 + Make the module dir configurable commit b458a723e098531da7dbfac39747dc34df431831 Author: Kevin E Martin [EMAIL PROTECTED] Date: Wed Jul 13 02:20:57 2005 + Update all input drivers to pass distcheck commit f603ac2e59944b7f75ff82803c67f2ce02321646 Author: Adam Jackson [EMAIL PROTECTED] Date: Tue Jul 12 06:15:07 2005 + Build skeletons for input drivers. Should basically work. commit 0b74a6722cf7c0e24bf31720cfa4ce0eb1a479d2 Author: Adam Jackson [EMAIL PROTECTED] Date: Mon Jul 11 02:37:58 2005 + Prep input drivers
