diff options
author | Tiago Vignatti <tiago.vignatti@nokia.com> | 2010-05-02 21:33:26 +0300 |
---|---|---|
committer | Tiago Vignatti <tiago.vignatti@nokia.com> | 2010-05-19 18:34:35 +0300 |
commit | 0dd299864a133d478e4635bd1cd305b67fc3964d (patch) | |
tree | bfafa7c922e89b0558158dccad2891e733a277b8 | |
parent | f28515b5f774b83e0481acbcdda2f682738079b9 (diff) |
xfree86: remove xf86EnableAccess
It's RAC remnant. This was substituted by xf86VGAarbiter{Lock, Unlock}
mechanism.
It's an API break, but the few drivers using it were covered already with
macros to avoid problems.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
-rw-r--r-- | hw/xfree86/common/xf86.h | 1 | ||||
-rw-r--r-- | hw/xfree86/common/xf86Bus.c | 23 | ||||
-rw-r--r-- | 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 d889057ed..68c3744f9 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 2a0c5c867..153fc7428 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 87d40e0b3..f84feec52 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) { |