From 7a1549678a19c6e94e1ecb3223c74effbd5009d2 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sun, 29 Aug 2010 17:54:19 +0200 Subject: Don't attempt to stop video on Mach64's without hardware overlay support 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 --- src/atimach64xv.c | 3 +++ 1 file changed, 3 insertions(+) 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); -- cgit v1.2.3