summaryrefslogtreecommitdiff
path: root/src/mga_driver.c
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-06-15 20:06:43 +0000
committerIan Romanick <idr@us.ibm.com>2005-06-15 20:06:43 +0000
commita6e0ae358bdb26452444d916a956c07da7fe88f4 (patch)
tree10ef00eff37041962d67826fe5c2514320651b52 /src/mga_driver.c
parentc2e50aad47ce32f528dad2abee8b7a8df363c93e (diff)
Adds support for MGA DRM version 3.2.
Update MGA DDX to use new features of MGA DRM ersion 3.2 to enable DRI support on PCI cards. Backwards compatability with older client-side drivers is enabled with new Device section settings. See mga.man for details. Xorg bug: 3259 Reviewed by: Eric Anholt
Diffstat (limited to 'src/mga_driver.c')
-rw-r--r--src/mga_driver.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/mga_driver.c b/src/mga_driver.c
index c2c3724..7bd1666 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -219,6 +219,8 @@ static const OptionInfoRec MGAOptions[] = {
{ OPTION_VREFRESH2, "Monitor2VRefresh", OPTV_ANYSTR, {0}, FALSE },
{ OPTION_MONITOR2POS, "Monitor2Position", OPTV_ANYSTR, {0}, FALSE },
{ OPTION_METAMODES, "MetaModes", OPTV_ANYSTR, {0}, FALSE },
+ { OPTION_OLDDMA, "OldDmaInit", OPTV_BOOLEAN, {0}, FALSE },
+ { OPTION_PCIDMA, "ForcePciDma", OPTV_BOOLEAN, {0}, FALSE },
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
@@ -1565,6 +1567,14 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, from, "Using AGP %dx mode\n",
pMga->agpMode);
+
+ if (xf86ReturnOptValBool(pMga->Options, OPTION_OLDDMA, FALSE)) {
+ pMga->useOldDmaInit = TRUE;
+ }
+
+ if (xf86ReturnOptValBool(pMga->Options, OPTION_PCIDMA, FALSE)) {
+ pMga->forcePciDma = TRUE;
+ }
#endif
from = X_DEFAULT;