summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorairlied <airlied>2004-02-13 11:49:54 +0000
committerairlied <airlied>2004-02-13 11:49:54 +0000
commitdd3a7fdde4148c5093727c02f86be422c2b8feb2 (patch)
tree55b18660aeca126def4a0aa311eb58910b8dfc33
parent48843749bc797120f09361fa646f9424e7a60587 (diff)
fixed up symbols not defined stuff..
-rw-r--r--xc/programs/Xserver/hw/xfree86/drivers/ati/aticonfig.c1
-rw-r--r--xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c4
-rw-r--r--xc/programs/Xserver/hw/xfree86/drivers/ati/atiload.c2
-rw-r--r--xc/programs/Xserver/hw/xfree86/drivers/ati/atioption.c21
4 files changed, 27 insertions, 1 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/aticonfig.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/aticonfig.c
index d9854b878..2f528d9c4 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/aticonfig.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/aticonfig.c
@@ -169,6 +169,7 @@ ATIProcessOptions
}
Blend = PanelDisplay = TRUE;
+ DMAMode = "async";
xf86ProcessOptions(pScreenInfo->scrnIndex, pScreenInfo->options,
PublicOption);
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c
index 521c18140..8ff56b921 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/aticonsole.c
@@ -25,17 +25,21 @@
* Leif Delgass <ldelgass@retinalburn.net>
*/
+#include "ati.h"
#include "atiadapter.h"
#include "aticonsole.h"
#include "aticrtc.h"
#include "atii2c.h"
#include "atilock.h"
#include "atimach64.h"
+#include "atimach64io.h"
#include "atimode.h"
#include "atistruct.h"
#include "ativga.h"
#include "atividmem.h"
+
+
#include "xf86.h"
/*
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/atiload.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/atiload.c
index 84c4e8d7f..c56a8f0a7 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/atiload.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/atiload.c
@@ -47,7 +47,7 @@ const char *ATIint10Symbols[] =
const char *ATIddcSymbols[] =
{
"xf86PrintEDID",
- "xf86SetDDCProperties",
+ "xf86SetDDCproperties",
NULL
};
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/atioption.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/atioption.c
index 86e16de5d..1bd90eca5 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/atioption.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/atioption.c
@@ -99,6 +99,27 @@ const OptionInfoRec ATIPublicOptions[] =
{0, },
FALSE,
},
+ {
+ ATI_OPTION_AGP_SIZE,
+ "agp_size",
+ OPTV_INTEGER,
+ {0, },
+ FALSE,
+ },
+ {
+ ATI_OPTION_LOCAL_TEXTURES,
+ "local_textures",
+ OPTV_BOOLEAN,
+ {0, },
+ FALSE,
+ },
+ {
+ ATI_OPTION_BUFFER_SIZE,
+ "buffer_size",
+ OPTV_INTEGER,
+ {0, },
+ FALSE,
+ },
#endif /* XF86DRI */