Re: [PATCH] xserver: remove all of RAC and access code
On Tue, 2009-07-28 at 09:17 +1000, Dave Airlie wrote:
On Thu, 2009-07-23 at 12:32 +1000, Dave Airlie wrote:
this is a major API + ABI break, we'll be adding back vga arb support after
this hopefully.
So after a bit of messing around I think removing everything makes it
hard to build drivers for 1.6 and 1.7, so I'm going to add some api
compat for now.
Mainly I'm thinking of keeping the third member the pci
@@ -285,27 +273,29 @@ extern _X_EXPORT pointer xf86FindXvOptions(int
scrnIndex, int adapt_index, char
extern _X_EXPORT void xf86GetOS(const char **name, int *major, int *minor,
int *teeny);
extern _X_EXPORT ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn, int
scrnFlag,
int entityIndex,PciChipsets *p_chip,
- resList res, EntityProc init,
+ EntityProc init,
EntityProc enter, EntityProc leave,
pointer private);
extern _X_EXPORT ScrnInfoPtr xf86ConfigFbEntity(ScrnInfoPtr pScrn, int
scrnFlag,
int entityIndex, EntityProc init,
EntityProc enter, EntityProc leave,
pointer private);
+
/* Obsolete! don't use */
extern _X_EXPORT Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn,
int entityIndex,PciChipsets *p_chip,
- resList res, EntityProc init,
+ EntityProc init,
EntityProc enter, EntityProc leave,
pointer private);
Add a spare member instead of resList, so the function signatures don't
change.
diff --git a/hw/xfree86/common/xf86Resources.h
b/hw/xfree86/common/xf86Resources.h
deleted file mode 100644
index 012fa69..000
--- a/hw/xfree86/common/xf86Resources.h
+++ /dev/null
@@ -1,137 +0,0 @@
-
-/* Old style names */
-#define RES_EXCLUSIVE_VGA resVgaExclusive
-#define RES_SHARED_VGA resVgaShared
-#define RES_EXCLUSIVE_8514 res8514Exclusive
-#define RES_SHARED_8514 res8514Shared
add some dummy defines for these.
-
typedef struct _PciChipsets {
/**
* Key used to match this device with its name in an array of
@@ -720,10 +581,6 @@ typedef struct _PciChipsets {
*/
int PCIid;
-/**
- * Resources associated with this type of device.
- */
-resRange *resList;
} PciChipsets;
add a dummy for resRange here so we don't have to rewrite the pci ids
structs in lots of drivers.
good idea or bad idea?
Love it!
--
Eric Anholt
e...@anholt.net eric.anh...@intel.com
signature.asc
Description: This is a digitally signed message part
___
xorg-devel mailing list
xorg-devel@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] xserver: remove all of RAC and access code
On Thu, 2009-07-23 at 12:32 +1000, Dave Airlie wrote:
this is a major API + ABI break, we'll be adding back vga arb support after
this hopefully.
So after a bit of messing around I think removing everything makes it
hard to build drivers for 1.6 and 1.7, so I'm going to add some api
compat for now.
Mainly I'm thinking of keeping the third member the pci
@@ -285,27 +273,29 @@ extern _X_EXPORT pointer xf86FindXvOptions(int
scrnIndex, int adapt_index, char
extern _X_EXPORT void xf86GetOS(const char **name, int *major, int *minor,
int *teeny);
extern _X_EXPORT ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn, int
scrnFlag,
int entityIndex,PciChipsets *p_chip,
- resList res, EntityProc init,
+ EntityProc init,
EntityProc enter, EntityProc leave,
pointer private);
extern _X_EXPORT ScrnInfoPtr xf86ConfigFbEntity(ScrnInfoPtr pScrn, int
scrnFlag,
int entityIndex, EntityProc init,
EntityProc enter, EntityProc leave,
pointer private);
+
/* Obsolete! don't use */
extern _X_EXPORT Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn,
int entityIndex,PciChipsets *p_chip,
- resList res, EntityProc init,
+ EntityProc init,
EntityProc enter, EntityProc leave,
pointer private);
Add a spare member instead of resList, so the function signatures don't
change.
diff --git a/hw/xfree86/common/xf86Resources.h
b/hw/xfree86/common/xf86Resources.h
deleted file mode 100644
index 012fa69..000
--- a/hw/xfree86/common/xf86Resources.h
+++ /dev/null
@@ -1,137 +0,0 @@
-
-/* Old style names */
-#define RES_EXCLUSIVE_VGA resVgaExclusive
-#define RES_SHARED_VGA resVgaShared
-#define RES_EXCLUSIVE_8514 res8514Exclusive
-#define RES_SHARED_8514 res8514Shared
add some dummy defines for these.
-
typedef struct _PciChipsets {
/**
* Key used to match this device with its name in an array of
@@ -720,10 +581,6 @@ typedef struct _PciChipsets {
*/
int PCIid;
-/**
- * Resources associated with this type of device.
- */
-resRange *resList;
} PciChipsets;
add a dummy for resRange here so we don't have to rewrite the pci ids
structs in lots of drivers.
good idea or bad idea?
Dave.
___
xorg-devel mailing list
xorg-devel@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] xserver: remove all of RAC and access code
This is a significant change too the way in which resources of memory are managed. My vote is you tag the current branch head and start to stabilize else your never going to have a release any time soon. Just my half cent, Cheers, Edward. 2009/7/23 Alan Coopersmith alan.coopersm...@sun.com: Dave Airlie wrote: this is a major API + ABI break, we'll be adding back vga arb support after this hopefully. Is that going to be done soon, or should we fork the server-1.7-branch before you put this in master? -- -Alan Coopersmith- alan.coopersm...@sun.com Sun Microsystems, Inc. - X Window System Engineering ___ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel -- -- Edward O'Callaghan http://www.auroraux.org/ eocallaghan at auroraux dot org ___ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] xserver: remove all of RAC and access code
On Thu, 2009-07-23 at 07:09 -0700, Alan Coopersmith wrote: Dave Airlie wrote: this is a major API + ABI break, we'll be adding back vga arb support after this hopefully. Is that going to be done soon, or should we fork the server-1.7-branch before you put this in master? I was going to do it + all the drivers today so we can ship it in Fedora 12 This code has been broken for a long long time at least since pciaccess. Dave. ___ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] xserver: remove all of RAC and access code
On Thu, 2009-07-23 at 19:28 +0100, Edward O'Callaghan wrote: This is a significant change too the way in which resources of memory are managed. My vote is you tag the current branch head and start to stabilize else your never going to have a release any time soon. It nearly totally unused code for 2-3 server major revisions now, since we migrated to libpciaccess. So its not the scary, the hard part is fixing up all the driver APIs which I'm quite willing to do. Dave. Just my half cent, Cheers, Edward. 2009/7/23 Alan Coopersmith alan.coopersm...@sun.com: Dave Airlie wrote: this is a major API + ABI break, we'll be adding back vga arb support after this hopefully. Is that going to be done soon, or should we fork the server-1.7-branch before you put this in master? -- -Alan Coopersmith- alan.coopersm...@sun.com Sun Microsystems, Inc. - X Window System Engineering ___ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel -- ___ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] xserver: remove all of RAC and access code
Multiple NVIDIA GPUs still works great here with that patch. I say ship it. You could drop all the stub functions too, as far as I'm concerned. A single screen with xf86-video-vesa also works with some very minor hacking. On Wed, Jul 22, 2009 at 07:32:02PM -0700, Dave Airlie wrote: this is a major API + ABI break, we'll be adding back vga arb support after this hopefully. --- hw/xfree86/common/Makefile.am |9 +- hw/xfree86/common/xf86.h | 20 +- hw/xfree86/common/xf86Bus.c| 1816 +--- hw/xfree86/common/xf86Bus.h| 41 +- hw/xfree86/common/xf86Configure.c |2 - hw/xfree86/common/xf86DGA.c|5 - hw/xfree86/common/xf86Events.c |3 - hw/xfree86/common/xf86Helper.c | 37 +- hw/xfree86/common/xf86Init.c |7 - hw/xfree86/common/xf86PM.c |4 +- hw/xfree86/common/xf86Priv.h |3 - hw/xfree86/common/xf86RAC.c| 1171 -- hw/xfree86/common/xf86RAC.h| 17 - hw/xfree86/common/xf86Resources.h | 137 --- hw/xfree86/common/xf86fbBus.c |8 - hw/xfree86/common/xf86noBus.c |8 - hw/xfree86/common/xf86pciBus.c | 425 +--- hw/xfree86/common/xf86pciBus.h |4 - hw/xfree86/common/xf86str.h| 150 --- hw/xfree86/loader/sdksyms.sh |2 - hw/xfree86/os-support/bsd/Makefile.am |3 - hw/xfree86/os-support/bus/linuxPci.c | 55 - hw/xfree86/os-support/hurd/Makefile.am |1 - hw/xfree86/os-support/linux/Makefile.am|1 - hw/xfree86/os-support/shared/stdResource.c | 110 -- hw/xfree86/os-support/solaris/Makefile.am |1 - hw/xfree86/os-support/xf86_OSproc.h|9 - 27 files changed, 25 insertions(+), 4024 deletions(-) delete mode 100644 hw/xfree86/common/xf86RAC.c delete mode 100644 hw/xfree86/common/xf86RAC.h delete mode 100644 hw/xfree86/common/xf86Resources.h delete mode 100644 hw/xfree86/os-support/shared/stdResource.c [lots of stuff deleted] -- 1.6.2.5 ___ xorg-devel mailing list xorg-devel@lists.x.org http://lists.x.org/mailman/listinfo/xorg-devel
