[PATCH 09/10] xfree86: remove xf86EnableAccess

Mark Kettenis mark.kettenis at xs4all.nl
Sun May 2 14:29:08 PDT 2010


> From: Tiago Vignatti <tiago.vignatti at nokia.com>
> Date: Sun,  2 May 2010 23:07:45 +0300
> 
> It's RAC remnant. This was substituted by xf86VGAarbiter{Lock, Unlock}
> mechanism.

Is it really necessary to break drivers that might function perfectly
well on systems that don't require VGA arbitration because there is
only one VGA device in the system.

You're only saving a few bytes by removing a few functions.

> Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
> ---
>  hw/xfree86/common/xf86.h          |    1 -
>  hw/xfree86/common/xf86Bus.c       |   23 -----------------------
>  hw/xfree86/common/xf86Configure.c |    1 -
>  3 files changed, 0 insertions(+), 25 deletions(-)
> 
> diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
> index e9266ab..34b3b6e 100644
> --- a/hw/xfree86/common/xf86.h
> +++ b/hw/xfree86/common/xf86.h
> @@ -104,7 +104,6 @@ extern _X_EXPORT void xf86FormatPciBusNumber(int busnum, char *buffer);
>  extern _X_EXPORT int  xf86GetFbInfoForScreen(int scrnIndex);
>  extern _X_EXPORT int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
>  extern _X_EXPORT int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
> -extern _X_EXPORT void xf86EnableAccess(ScrnInfoPtr pScrn);
>  extern _X_EXPORT Bool xf86IsPrimaryPci(struct pci_device * pPci);
>  /* new RAC */
>  extern _X_EXPORT Bool xf86DriverHasEntities(DriverPtr drvp);
> diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
> index eff78db..f537100 100644
> --- a/hw/xfree86/common/xf86Bus.c
> +++ b/hw/xfree86/common/xf86Bus.c
> @@ -371,29 +371,6 @@ xf86AccessLeave(void)
>  }
>  
>  /*
> - * xf86EnableAccess() -- enable access to controlled resources.
> - * To reduce latency when switching access the ScrnInfoRec has
> - * a linked list of the EntityAccPtr of all screen entities.
> - */
> -/*
> - * switching access needs to be done in te following oder:
> - * disable
> - * 1. disable old entity
> - * 2. reroute bus
> - * 3. enable new entity
> - * Otherwise resources needed for access control might be shadowed
> - * by other resources!
> - */
> -
> -void
> -xf86EnableAccess(ScrnInfoPtr pScrn)
> -{
> -    DebugF("Enable access %i\n",pScrn->scrnIndex);
> -
> -    return;
> -}
> -
> -/*
>   * xf86EnterServerState() -- set state the server is in.
>   */
>  
> diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
> index d83dfb9..a7591ba 100644
> --- a/hw/xfree86/common/xf86Configure.c
> +++ b/hw/xfree86/common/xf86Configure.c
> @@ -833,7 +833,6 @@ DoConfigure(void)
>  
>  	ConfiguredMonitor = NULL;
>  
> -	xf86EnableAccess(xf86Screens[dev2screen[j]]);
>  	if ((*xf86Screens[dev2screen[j]]->PreInit)(xf86Screens[dev2screen[j]], 
>  						   PROBE_DETECT) &&
>  	    ConfiguredMonitor) {
> -- 
> 1.6.0.4
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 


More information about the xorg-devel mailing list