README | 20 ++++++++++++++++++++
configure.ac | 2 +-
src/ark_driver.c | 55 ++++++++-----------------------------------------------
3 files changed, 29 insertions(+), 48 deletions(-)
New commits:
commit 9d2a2c6b8de41c39f59602e04aac68644dadf45e
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Sep 7 14:47:47 2009 +1000
ark: fix make distcheck
diff --git a/src/ark_driver.c b/src/ark_driver.c
index ee94a14..5de3b9a 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -45,6 +45,10 @@
#include "fb.h"
#include "ark.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+#include "xf86Resources.h"
+#endif
+
#include <string.h>
/*
commit 93856287f1e753d7df0ebfc51b12b425447138cf
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Sep 7 14:44:22 2009 +1000
bump release to 0.7.2
diff --git a/configure.ac b/configure.ac
index 5d8ec8b..7267f4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ark],
- 0.7.1,
+ 0.7.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ark)
commit e521e8240c1acc49a514db123cb67beb669dea81
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 13:32:28 2009 +1000
ark: update for resources/RAC API removal
diff --git a/src/ark_driver.c b/src/ark_driver.c
index db5303c..ee94a14 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -35,7 +35,6 @@
#include "xf86_OSproc.h"
#include "xf86Pci.h"
#include "xf86PciInfo.h"
-#include "xf86Resources.h"
#include "xf86fbman.h"
#include "xf86cmap.h"
#include "compiler.h"
@@ -313,16 +312,7 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
}
pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
- if (pEnt->resources) {
- xfree(pEnt);
- ARKFreeRec(pScrn);
- return FALSE;
- }
-
pARK->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
- xf86RegisterResources(pEnt->index, NULL, ResNone);
- xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
- xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
if (pEnt->device->chipset && *pEnt->device->chipset) {
pScrn->chipset = pEnt->device->chipset;
commit 150d86dd0fff038db660f993d080cc3f7a09f6c5
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 10:03:50 2009 +1000
ark: switch to using pci config instead of active
diff --git a/src/ark_driver.c b/src/ark_driver.c
index e69250b..db5303c 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -207,7 +207,10 @@ static Bool ARKProbe(DriverPtr drv, int flags)
if (flags & PROBE_DETECT)
foundScreen = TRUE;
else for (i=0; i<numUsed; i++) {
- ScrnInfoPtr pScrn = xf86AllocateScreen(drv, 0);
+ ScrnInfoPtr pScrn = NULL;
+
+ pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
ARKPciChipsets,
+ NULL, NULL, NULL, NULL, NULL);
pScrn->driverVersion = VERSION_MAJOR;
pScrn->driverName = DRIVER_NAME;
@@ -221,8 +224,6 @@ static Bool ARKProbe(DriverPtr drv, int flags)
pScrn->LeaveVT = ARKLeaveVT;
pScrn->FreeScreen = ARKFreeScreen;
foundScreen = TRUE;
- xf86ConfigActivePciEntity(pScrn, usedChips[i], ARKPciChipsets,
- NULL, NULL, NULL, NULL, NULL);
}
xfree(usedChips);
commit 05ce888200307d9c6f16fbdbf732cbae8b5a3dae
Author: Adam Jackson <a...@redhat.com>
Date: Thu May 28 14:46:19 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 67eb076..e69250b 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -113,34 +113,6 @@ static const OptionInfoRec ARKOptions[] = {
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
-static const char *vgaHWSymbols[] = {
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWUnlock",
- "vgaHWUnmapMem",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAAInit",
- NULL
-};
-
#ifdef XFree86LOADER
MODULESETUPPROTO(ARKSetup);
@@ -167,7 +139,6 @@ pointer ARKSetup(pointer module, pointer opts, int *errmaj,
int *errmin)
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&ARK, module, 0);
- LoaderRefSymLists(fbSymbols, vgaHWSymbols, xaaSymbols, NULL);
return (pointer) 1;
} else {
if (errmaj)
@@ -277,8 +248,6 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgaHWSymbols, NULL);
-
if (!vgaHWGetHWRec(pScrn))
return FALSE;
@@ -499,14 +468,11 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
if (!pARK->NoAccel) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
ARKFreeRec(pScrn);
return FALSE;
}
- xf86LoaderReqSymLists(xaaSymbols, NULL);
}
return TRUE;
commit 9acf6f68c98159ea5bb2d29454444ed143e7d6f2
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Jan 30 20:30:48 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..680472d
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-video-ark - Ark Logic video driver for Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ark
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-ark
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
