From 79182538b43ecd35bf2b47eccfb2dd3bbcdc12eb Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon, 31 Aug 2009 19:25:13 +0300
Subject: [PATCH] xfree86: removal of some dead code due VGA arbiter's
 inclusion

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
---
 hw/xfree86/common/xf86.h       |  1 -
 hw/xfree86/common/xf86Bus.c    | 17 -----------------
 hw/xfree86/common/xf86Init.c   |  4 ----
 hw/xfree86/common/xf86Priv.h   |  1 -
 hw/xfree86/int10/helper_exec.c |  4 ----
 5 files changed, 27 deletions(-)

diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index c59d4b110..e9266abd4 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -105,7 +105,6 @@ 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 void xf86SetCurrentAccess(Bool Enable, 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 870999402..eb68f7ff6 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -455,12 +455,6 @@ xf86EnableAccess(ScrnInfoPtr pScrn)
     return;
 }
 
-void
-xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn)
-{
-  return;
-}
-
 /*
  * xf86EnterServerState() -- set state the server is in.
  */
@@ -497,9 +491,6 @@ xf86EnterServerState(xf86State state)
     else
 	DebugF("Entering OPERATING state\n");
 
-    /* When servicing a dumb framebuffer we don't need to do anything */
-    if (doFramebufferMode) return;
-
     return;
 }
 
@@ -528,12 +519,6 @@ xf86PostProbe(void)
     }
 }
 
-void
-xf86PostPreInit(void)
-{
-  if (doFramebufferMode) return;
-}
-
 void
 xf86PostScreenInit(void)
 {
@@ -594,8 +579,6 @@ xf86FindPrimaryDevice(void)
     }
 }
 
-/* Multihead accel sharing accessor functions and entity Private handling */
-
 int
 xf86GetLastScrnFlag(int entityIndex)
 {
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 327c1ffbc..f9224b1a6 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -962,10 +962,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 	    break;
 	}
     }
-
-    /* set up the proper access funcs */
-    xf86PostPreInit();
-
   } else {
     /*
      * serverGeneration != 1; some OSs have to do things here, too.
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 5ce4dbbf4..3bb15718c 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -121,7 +121,6 @@ extern _X_EXPORT void xf86FindPrimaryDevice(void);
 extern _X_EXPORT void xf86PostProbe(void);
 extern _X_EXPORT void xf86ClearEntityListForScreen(int scrnIndex);
 extern _X_EXPORT void xf86AddDevToEntity(int entityIndex, GDevPtr dev);
-extern _X_EXPORT void xf86PostPreInit(void);
 extern _X_EXPORT void xf86PostScreenInit(void);
 
 /* xf86Config.c */
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index 94b3d2d9c..6ba647f89 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -644,7 +644,6 @@ bios_checksum(const CARD8 *start, int size)
 void
 LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)
 {
-    xf86SetCurrentAccess(FALSE, xf86Screens[pInt->scrnIndex]);
     vga->save_msr    = inb(pInt->ioBase + 0x03CC);
     vga->save_vse    = inb(pInt->ioBase + 0x03C3);
 #ifndef __ia64__
@@ -657,20 +656,17 @@ LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)
     outb(pInt->ioBase + 0x46E8, ~(CARD8)0x08 & vga->save_46e8);
 #endif
     outb(pInt->ioBase + 0x0102, ~(CARD8)0x01 & vga->save_pos102);
-    xf86SetCurrentAccess(TRUE, xf86Screens[pInt->scrnIndex]);
 }
 
 void
 UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)
 {
-    xf86SetCurrentAccess(FALSE, xf86Screens[pInt->scrnIndex]);
     outb(pInt->ioBase + 0x0102, vga->save_pos102);
 #ifndef __ia64__
     outb(pInt->ioBase + 0x46E8, vga->save_46e8);
 #endif
     outb(pInt->ioBase + 0x03C3, vga->save_vse);
     outb(pInt->ioBase + 0x03C2, vga->save_msr);
-    xf86SetCurrentAccess(TRUE, xf86Screens[pInt->scrnIndex]);
 }
 
 #if defined (_PC)