[PATCH mach64] Don't attempt to stop video on Mach64's without hardware overlay support

Mark Kettenis mark.kettenis at xs4all.nl
Sun Aug 29 09:06:04 PDT 2010


Older Mach64 variants don't have hardware overlay support.  This is handled
properly when the XVideo adapter is initialized (we bail out early), but
ATICloseXVideo() unconditionally tries to stop video during screen termination.
This causes the server to hang on certain multi-card setups.  Fix the issue
by checking Block1Base before proceeding with stopping video.

Signed-off-by: Mark Kettenis <kettenis at openbsd.org>
---
 src/atimach64xv.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/atimach64xv.c b/src/atimach64xv.c
index 21cd890..2c9b812 100644
--- a/src/atimach64xv.c
+++ b/src/atimach64xv.c
@@ -1552,6 +1552,9 @@ ATICloseXVideo
     ATIPtr      pATI
 )
 {
+    if (!pATI->Block1Base)
+        return;
+
     ATIMach64StopVideo(pScreenInfo, pATI, TRUE);
 
     REGION_UNINIT(pScreen, &pATI->VideoClip);
-- 
1.7.1



More information about the xorg-devel mailing list