xserver: Branch 'master' - 3 commits
Tiago Vignatti
vignatti at kemper.freedesktop.org
Mon Aug 31 10:45:18 PDT 2009
hw/xfree86/common/xf86.h | 1 -
hw/xfree86/common/xf86Bus.c | 18 ------------------
hw/xfree86/common/xf86Init.c | 4 ----
hw/xfree86/common/xf86Priv.h | 1 -
hw/xfree86/common/xf86VGAarbiter.c | 4 ++--
hw/xfree86/int10/helper_exec.c | 4 ----
hw/xfree86/os-support/bus/linuxPci.c | 1 -
7 files changed, 2 insertions(+), 31 deletions(-)
New commits:
commit 295e598d9a83ff7162a093810ca9f546d00c0968
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date: Mon Aug 31 20:04:51 2009 +0300
xfree86: remove _more_ RAC junk
Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index eb68f7f..e0d9804 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -46,7 +46,6 @@
#include "xf86Bus.h"
#define XF86_OS_PRIVS
-#define NEED_OS_RAC_PROTOS
#include "xf86_OSproc.h"
#include "xf86VGAarbiter.h"
diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index 3d77d7f..920a149 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -52,7 +52,6 @@
#include "compiler.h"
#include "xf86.h"
#include "xf86Priv.h"
-#define NEED_OS_RAC_PROTOS
#include "xf86_OSlib.h"
#include "Pci.h"
#include <dirent.h>
commit 38627b2eaf64aa8fe694fc3e1f5e4fee0c9c11c3
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date: Mon Aug 31 19:36:02 2009 +0300
xfree86: shut up vgaarb warnings when server doesn't support it
Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
index 7b4aa34..f8a2882 100644
--- a/hw/xfree86/common/xf86VGAarbiter.c
+++ b/hw/xfree86/common/xf86VGAarbiter.c
@@ -31,6 +31,8 @@
#include "xorg-config.h"
#include "xf86VGAarbiter.h"
+
+#ifdef HAVE_PCI_DEVICE_VGAARB_INIT
#include "xf86VGAarbiterPriv.h"
#include "xf86Bus.h"
#include "pciaccess.h"
@@ -44,8 +46,6 @@
#define DPRINT(x)
#endif
-#ifdef HAVE_PCI_DEVICE_VGAARB_INIT
-
static GCFuncs VGAarbiterGCFuncs = {
VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC,
VGAarbiterDestroyGC, VGAarbiterChangeClip, VGAarbiterDestroyClip,
commit 79182538b43ecd35bf2b47eccfb2dd3bbcdc12eb
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date: Mon Aug 31 19:25:13 2009 +0300
xfree86: removal of some dead code due VGA arbiter's inclusion
Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index c59d4b1..e9266ab 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 8709994..eb68f7f 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;
}
@@ -529,12 +520,6 @@ xf86PostProbe(void)
}
void
-xf86PostPreInit(void)
-{
- if (doFramebufferMode) return;
-}
-
-void
xf86PostScreenInit(void)
{
int i;
@@ -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 327c1ff..f9224b1 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 5ce4dbb..3bb1571 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 94b3d2d..6ba647f 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)
More information about the xorg-commit
mailing list