summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2003-10-09 07:12:01 +0000
committerKeith Packard <keithp@keithp.com>2003-10-09 07:12:01 +0000
commit10f721acc5e59ea4152b94246b62963f2ff9d678 (patch)
tree788251d175d6ac2f5695fd8592268d3aeacdfc3b
parentf74555e94264e6f703d399a5e0475c7283e20a88 (diff)
Leave iopl set to 3 so vesa module will work
-rw-r--r--hw/kdrive/smi/smi.c3
-rw-r--r--hw/kdrive/smi/smidraw.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/kdrive/smi/smi.c b/hw/kdrive/smi/smi.c
index b8c8c93bd..4ca87dbf3 100644
--- a/hw/kdrive/smi/smi.c
+++ b/hw/kdrive/smi/smi.c
@@ -236,6 +236,7 @@ smiEnable (ScreenPtr pScreen)
SmiCardInfo *smic = pScreenPriv->card->driver;
ENTER ();
+ iopl (3);
if (!subEnable (pScreen))
return FALSE;
@@ -257,9 +258,11 @@ smiDisable (ScreenPtr pScreen)
SmiCardInfo *smic = pScreenPriv->card->driver;
ENTER ();
+#if 0
#ifdef XV
KdXVDisable (pScreen);
#endif
+#endif
smiResetMMIO (pScreenPriv->card, smic);
subDisable (pScreen);
LEAVE ();
diff --git a/hw/kdrive/smi/smidraw.c b/hw/kdrive/smi/smidraw.c
index a4cf4f52e..12910bbb1 100644
--- a/hw/kdrive/smi/smidraw.c
+++ b/hw/kdrive/smi/smidraw.c
@@ -285,8 +285,6 @@ smiDrawEnable (ScreenPtr pScreen)
smic = getSmiCardInfo(pScreenPriv);
dpr = smic->dpr;
- iopl(3);
-
smis->stride = pScreenPriv->screen->fb[0].byteStride;
smis->dpr_vpr_enable = smiGetIndex (smic, VGA_SEQ_INDEX,
VGA_SEQ_DATA, 0x21) & ~0x03;
@@ -329,7 +327,6 @@ smiDrawDisable (ScreenPtr pScreen)
smis = 0;
dpr = 0;
accel_cmd = 0;
- iopl (0);
LEAVE ();
}