summaryrefslogtreecommitdiff
path: root/src/radeon_video.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-09-23 07:57:15 +0100
committerAlex Deucher <alexander.deucher@amd.com>2013-09-30 08:57:40 -0400
commit2d791370dfc5570eb74d7a1fb3baf4d4c8ecf243 (patch)
tree1a641ca523728d62be15c69955e513071842fd09 /src/radeon_video.c
parentcbb99f659ee7b18ded0008a606e41ded38c1a194 (diff)
radeon: use glamor Xv support if present.
This creates adaptors using glamor if possible. Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/radeon_video.c')
-rw-r--r--src/radeon_video.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 56cd9abd..5349d113 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -165,7 +165,14 @@ void RADEONInitVideo(ScreenPtr pScreen)
memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
adaptors = newAdaptors;
- if ((info->ChipFamily < CHIP_FAMILY_RS400)
+ if (info->use_glamor) {
+ texturedAdaptor = radeon_glamor_xv_init(pScreen, 16);
+ if (texturedAdaptor != NULL) {
+ adaptors[num_adaptors++] = texturedAdaptor;
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up textured video (glamor)\n");
+ } else
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to set up textured video (glamor)\n");
+ } else if ((info->ChipFamily < CHIP_FAMILY_RS400)
|| (info->directRenderingEnabled)
) {
texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);