summaryrefslogtreecommitdiff
path: root/src/via_xvmc.c
diff options
context:
space:
mode:
authorThomas Hellstrom <unichrome@shipmail.org>2004-03-21 18:49:04 +0000
committerThomas Hellstrom <unichrome@shipmail.org>2004-03-21 18:49:04 +0000
commit1e0597209487403b85c6e521f1d57821658482bf (patch)
tree0534249879f15f378fdc2c1166bb71cb8cd1351f /src/via_xvmc.c
parent7299f048ee48f5a287c3129713f93665276e583b (diff)
Final (?) fix of bug reported by Huynh Tran. The server probably called
drmRmMap on non-existing maps when it exited. This probably caused a total machine lockup. :-(
Diffstat (limited to 'src/via_xvmc.c')
-rw-r--r--src/via_xvmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/via_xvmc.c b/src/via_xvmc.c
index 99dc6ec..d084812 100644
--- a/src/via_xvmc.c
+++ b/src/via_xvmc.c
@@ -309,7 +309,7 @@ void ViaInitXVMC(ScreenPtr pScreen)
initViaXvMC(vXvMC);
- if (! xf86XvMCScreenInit(pScreen, 1, ppAdapt)) {
+ if (! xf86XvMCScreenInit(pScreen, 1, ppAdapt)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[XvMC] XvMCScreenInit failed.\n");
drmRmMap(pVia->drmFD,vXvMC->mmioBase);
drmRmMap(pVia->drmFD,vXvMC->fbBase);
@@ -332,7 +332,7 @@ void ViaCleanupXVMC(ScreenPtr pScreen) {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
VIAPtr pVia = VIAPTR(pScrn);
ViaXvMCPtr vXvMC = &(pVia->xvmc);
-
+
if (pVia->XvMCEnabled) {
mpegDisable(pVia,0);
drmRmMap(pVia->drmFD,vXvMC->mmioBase);