diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index f03acf34f..89861e0a7 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -2105,7 +2105,6 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active, Bool g
devicep->driver = conf_device->dev_driver;
devicep->active = active;
devicep->videoRam = conf_device->dev_videoram;
- devicep->BiosBase = conf_device->dev_bios_base;
devicep->MemBase = conf_device->dev_mem_base;
devicep->IOBase = conf_device->dev_io_base;
devicep->clockchip = conf_device->dev_clockchip;
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index f975b98b6..668a55151 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -268,7 +268,6 @@ configureDeviceSection(int screennum)
for (i = 0; i < MAXDACSPEEDS; i++)
ptr->dev_dacSpeeds[i] = DevToConfig[screennum].GDev.dacSpeeds[i];
ptr->dev_videoram = DevToConfig[screennum].GDev.videoRam;
- ptr->dev_bios_base = DevToConfig[screennum].GDev.BiosBase;
ptr->dev_mem_base = DevToConfig[screennum].GDev.MemBase;
ptr->dev_io_base = DevToConfig[screennum].GDev.IOBase;
ptr->dev_clockchip = DevToConfig[screennum].GDev.clockchip;
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 4df10a56a..b06057522 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -303,7 +303,6 @@ typedef struct {
Bool active;
Bool inUse;
int videoRam;
- unsigned long BiosBase; /* Base address of video BIOS */
unsigned long MemBase; /* Frame buffer base address */
unsigned long IOBase;
int chipID;
@@ -648,7 +647,6 @@ typedef struct _ScrnInfoRec {
int numClocks; /* number of clocks */
int clock[MAXCLOCKS]; /* list of clock frequencies */
int videoRam; /* amount of video ram (kb) */
- unsigned long biosBase; /* Base address of video BIOS */
unsigned long memPhysBase; /* Physical address of FB */
unsigned long fbOffset; /* Offset of FB in the above */
int memClk; /* memory clock */
diff --git a/hw/xfree86/doc/ddxDesign.xml b/hw/xfree86/doc/ddxDesign.xml
index df5f64bde..0a141393a 100644
--- a/hw/xfree86/doc/ddxDesign.xml
+++ b/hw/xfree86/doc/ddxDesign.xml
@@ -1208,7 +1208,6 @@ Here is what InitOutput() does:
numClocks (if not programmable)
clock[] (if not programmable)
videoRam
- biosBase
memBase
memClk
driverPrivate
@@ -2920,34 +2919,6 @@ Two functions are provided to obtain a resource range of a given type:
-Some PCI devices are broken in the sense that they return invalid size
-information for a certain resource. In this case the driver can supply
-the correct size and make sure that the resource range allocated for
-the card is large enough to hold the address range decoded by the card.
-The function xf86FixPciResource() can be used to do this:
-
-
- Bool xf86FixPciResource(int entityIndex, unsigned int prt,
- CARD32 alignment, long type);
-
-
- This function fixes a PCI resource allocation. The
- prt parameter contains the number of the PCI base
- register that needs to be fixed (0-5, and
- 6 for the BIOS base register). The size is
- specified by the alignment. Since PCI resources need to span an
- integral range of size 2ˆn, the alignm ent also
- specifies the number of addresses that will be decoded. If the
- driver specifies a type mask it can override the default type for
- PCI resources which is ResShared. The resource
- broker needs to know that to find a matching resource range. This
- function should be called before calling
- xf86RegisterResources(). The return value is
- TRUE when the function succeeds.
-
-
-
-
Bool xf86CheckPciMemBase(pciVideoPtr pPci, memType base);
diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index 00ebf569f..25af3aa24 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -1470,12 +1470,6 @@ In most cases this is not required because the Xorg server probes
the graphics board to determine this quantity.
The driver-specific documentation should indicate when it might be needed.
.TP 7
-.BI "BiosBase " "baseaddress"
-This optional entry specifies the base address of the video BIOS for
-the VGA board.
-This address is normally auto-detected, and should only be specified if the
-driver-specific documentation recommends it.
-.TP 7
.BI "MemBase " "baseaddress"
This optional entry specifies the memory base address of a graphics
board's linear frame buffer.
diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c
index 353d48c64..34b7f6557 100644
--- a/hw/xfree86/parser/Device.c
+++ b/hw/xfree86/parser/Device.c
@@ -172,7 +172,7 @@ xf86parseDeviceSection(void)
case BIOSBASE:
if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
Error(NUMBER_MSG, "BIOSBase");
- ptr->dev_bios_base = xf86_lex_val.num;
+ /* ignored */
break;
case MEMBASE:
if (xf86getSubToken(&(ptr->dev_comment)) != NUMBER)
@@ -285,8 +285,6 @@ xf86printDeviceSection(FILE * cf, XF86ConfDevicePtr ptr)
}
if (ptr->dev_videoram)
fprintf(cf, "\tVideoRam %d\n", ptr->dev_videoram);
- if (ptr->dev_bios_base)
- fprintf(cf, "\tBiosBase 0x%lx\n", ptr->dev_bios_base);
if (ptr->dev_mem_base)
fprintf(cf, "\tMemBase 0x%lx\n", ptr->dev_mem_base);
if (ptr->dev_io_base)
diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h
index e014048ec..6762edbe1 100644
--- a/hw/xfree86/parser/xf86Parser.h
+++ b/hw/xfree86/parser/xf86Parser.h
@@ -211,7 +211,6 @@ typedef struct {
const char *dev_ramdac;
int dev_dacSpeeds[CONF_MAXDACSPEEDS];
int dev_videoram;
- unsigned long dev_bios_base;
unsigned long dev_mem_base;
unsigned long dev_io_base;
const char *dev_clockchip;