summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2006-10-13 15:31:43 -0700
committerKeith Packard <keithp@neko.keithp.com>2006-10-13 15:31:43 -0700
commitc5cca4c20ae6b519e3b021a9d90809c1b3d1facb (patch)
tree1bf1a1341caf99fbbadd81f99d52d60d3d60ee50
parentbf3820f1f505649ac0730add23d97d6de3f6d22c (diff)
Advertise textured video adapter first
-rw-r--r--src/i830_video.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/i830_video.c b/src/i830_video.c
index 6a18f932..47f4a03f 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -454,19 +454,6 @@ I830InitVideo(ScreenPtr pScreen)
xvBrightness = MAKE_ATOM("XV_BRIGHTNESS");
xvContrast = MAKE_ATOM("XV_CONTRAST");
- /* Set up overlay video if we can do it at this depth. */
- if (!IS_I965G(pI830) && pScrn->bitsPerPixel != 8) {
- overlayAdaptor = I830SetupImageVideoOverlay(pScreen);
- if (overlayAdaptor != NULL) {
- adaptors[num_adaptors++] = overlayAdaptor;
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up overlay video\n");
- } else {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Failed to set up overlay video\n");
- }
- I830InitOffscreenImages(pScreen);
- }
-
/* Set up textured video if we can do it at this depth and we are on
* supported hardware.
*/
@@ -481,6 +468,19 @@ I830InitVideo(ScreenPtr pScreen)
}
}
+ /* Set up overlay video if we can do it at this depth. */
+ if (!IS_I965G(pI830) && pScrn->bitsPerPixel != 8) {
+ overlayAdaptor = I830SetupImageVideoOverlay(pScreen);
+ if (overlayAdaptor != NULL) {
+ adaptors[num_adaptors++] = overlayAdaptor;
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up overlay video\n");
+ } else {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Failed to set up overlay video\n");
+ }
+ I830InitOffscreenImages(pScreen);
+ }
+
if (num_adaptors)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);