From 50e2ff9a2500078ebbd833fddab0d93f3a50b6a6 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 15 Feb 2006 03:20:55 +0000 Subject: [PATCH] Remove the waitSync from KdDisableScreen and push it off to drivers' disableAccel hook, which is more correct anyway. This makes kdrive.c not have any knowledge of kaa, opening the way for using exa from kdrive. --- ChangeLog | 9 +++++++++ hw/kdrive/ati/ChangeLog | 8 ++++++++ hw/kdrive/ati/ati_draw.c | 2 +- hw/kdrive/mga/mgadraw.c | 1 + hw/kdrive/src/kdrive.c | 2 -- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1337fc79..b61e7f135 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-02-14 Eric Anholt + + * hw/kdrive/mga/mgadraw.c: (mgaDrawDisable): + * hw/kdrive/src/kdrive.c: (KdDisableScreen): + Remove the waitSync from KdDisableScreen and push it off to drivers' + disableAccel hook, which is more correct anyway. This makes kdrive.c + not have any knowledge of kaa, opening the way for using exa from + kdrive. + 2006-02-14 Eric Anholt * GL/mesa/shader/slang/Makefile.am: diff --git a/hw/kdrive/ati/ChangeLog b/hw/kdrive/ati/ChangeLog index dcffbde80..d842f19b2 100644 --- a/hw/kdrive/ati/ChangeLog +++ b/hw/kdrive/ati/ChangeLog @@ -1,3 +1,11 @@ +2006-02-14 Eric Anholt + + * ati_draw.c: (ATIDrawDisable): + Remove the waitSync from KdDisableScreen and push it off to drivers' + disableAccel hook, which is more correct anyway. This makes kdrive.c + not have any knowledge of kaa, opening the way for using exa from + kdrive. + 2006-02-09 Keith Packard reviewed by: Eric Anholt diff --git a/hw/kdrive/ati/ati_draw.c b/hw/kdrive/ati/ati_draw.c index 28cc7b047..f71dac5f7 100644 --- a/hw/kdrive/ati/ati_draw.c +++ b/hw/kdrive/ati/ati_draw.c @@ -897,7 +897,7 @@ ATIDrawEnable(ScreenPtr pScreen) void ATIDrawDisable(ScreenPtr pScreen) { - + kaaWaitSync(pScreen); ATIDMATeardown(pScreen); } diff --git a/hw/kdrive/mga/mgadraw.c b/hw/kdrive/mga/mgadraw.c index f961fc38d..71d506ceb 100644 --- a/hw/kdrive/mga/mgadraw.c +++ b/hw/kdrive/mga/mgadraw.c @@ -317,6 +317,7 @@ mgaDrawEnable (ScreenPtr pScreen) void mgaDrawDisable (ScreenPtr pScreen) { + kaaWaitSync(pScreen); } void diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index dabce5481..bb8f79fef 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -38,7 +38,6 @@ #ifdef XV #include "kxv.h" #endif -#include "kaa.h" #ifdef DPMSExtension #include "dpmsproc.h" @@ -225,7 +224,6 @@ KdDisableScreen (ScreenPtr pScreen) if (!pScreenPriv->enabled) return; - kaaWaitSync (pScreen); if (!pScreenPriv->closed) KdSetRootClip (pScreen, FALSE); KdDisableColormap (pScreen);