summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2008-09-09 10:32:48 -0400
committerAdam Jackson <ajax@redhat.com>2008-09-09 10:32:48 -0400
commit46a0254b5a0bffe8c57322b085bcd38f893e4b27 (patch)
tree06d58eb93dfdfcafd5e15022297a44e21502e55e /src
parent89a9ad75f3e50e25275b803617d5e74709ead269 (diff)
Make sure the screen is a mach64 screen before doing anything in ATIMach64XVInitialiseAdaptor.
Diffstat (limited to 'src')
-rw-r--r--src/atimach64xv.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/atimach64xv.c b/src/atimach64xv.c
index ef17861..21cd890 100644
--- a/src/atimach64xv.c
+++ b/src/atimach64xv.c
@@ -31,6 +31,7 @@
#include "atimach64accel.h"
#include "atimach64io.h"
#include "atixv.h"
+#include "atimach64version.h"
#include <X11/extensions/Xv.h>
#include "fourcc.h"
@@ -1358,6 +1359,9 @@ ATIMach64XVInitialiseAdaptor
XF86OffscreenImagePtr surf0 = &(ATIMach64Surface[0]);
XF86OffscreenImagePtr surf1 = &(ATIMach64Surface[1]);
+ if (xf86NameCmp(pScreenInfo->driverName, MACH64_DRIVER_NAME) != 0)
+ return 0;
+
if (pppAdaptor)
*pppAdaptor = NULL;