summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyril Brulebois <kibi@debian.org>2010-11-08 14:10:44 +0100
committerJulien Cristau <jcristau@debian.org>2010-11-10 14:07:24 +0100
commitbe003f2568366ff9fc2ff70d6a69df64a2a25cca (patch)
treec85bce7c4dcf4c2464cc4737f694dbd385a20f5d
parent20909cd806af488cf529c74417afbc8a12438f4a (diff)
downloadxorg-driver-xf86-video-fbdev-be003f2568366ff9fc2ff70d6a69df64a2a25cca.tar.gz
Perform XV initialization only if the server supports it.
Use XV from server's xorg-server.h to determine whether to perform XV initialization. Signed-off-by: Cyril Brulebois <kibi@debian.org> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Julien Cristau <jcristau@debian.org>
-rw-r--r--src/fbdev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/fbdev.c b/src/fbdev.c
index 99672d3..7e12b1d 100644
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -896,6 +896,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
fPtr->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = FBDevCloseScreen;
+#if XV
{
XF86VideoAdaptorPtr *ptr;
@@ -904,6 +905,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
xf86XVScreenInit(pScreen,ptr,n);
}
}
+#endif
TRACE_EXIT("FBDevScreenInit");