[PATCH] xserver: remove all of RAC and access code

Dave Airlie airlied at redhat.com
Mon Jul 27 16:17:04 PDT 2009


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..0000000
> --- 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.




More information about the xorg-devel mailing list