diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2013-09-30 08:55:16 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-09-30 08:57:26 -0400 |
| commit | cbb99f659ee7b18ded0008a606e41ded38c1a194 (patch) | |
| tree | e9abb83f2897922184362d2aa726c1723dac3edd | |
| parent | 4fc1fa920584ace2c84d75af82d06962d0c84ec8 (diff) | |
Revert "radeon: add glamor Xv support (v2)"
This causes problems if glamor doesn't have Xv support
enabled. I just noticed that Dave has a better version,
so use that instead.
This reverts commit 4fc1fa920584ace2c84d75af82d06962d0c84ec8.
| -rw-r--r-- | src/radeon_kms.c | 2 | ||||
| -rw-r--r-- | src/radeon_video.c | 19 |
2 files changed, 4 insertions, 17 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 255906b8..9708dc75 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -1321,7 +1321,7 @@ Bool RADEONScreenInit_KMS(SCREEN_INIT_ARGS_DECL) */ /* xf86DiDGAInit(pScreen, info->LinearAddr + pScrn->fbOffset); */ #endif - if (info->r600_shadow_fb == FALSE) { + if (!info->use_glamor && info->r600_shadow_fb == FALSE) { /* Init Xv */ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "Initializing Xv\n"); diff --git a/src/radeon_video.c b/src/radeon_video.c index b07636c2..56cd9abd 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -16,10 +16,6 @@ #include "xf86.h" #include "dixstruct.h" -#ifdef USE_GLAMOR -#include <glamor.h> -#endif - /* DPMS */ #ifdef HAVE_XEXTPROTO_71 #include <X11/extensions/dpmsconst.h> @@ -169,18 +165,9 @@ void RADEONInitVideo(ScreenPtr pScreen) memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr)); adaptors = newAdaptors; -#ifdef USE_GLAMOR - if (info->use_glamor) { - texturedAdaptor = glamor_xv_init(pScreen, 16); - if (texturedAdaptor != NULL) { - adaptors[num_adaptors++] = texturedAdaptor; - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Set up glamor textured video\n"); - } else - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to set up glamor textured video\n"); - } else -#endif - if ((info->ChipFamily < CHIP_FAMILY_RS400) - || info->directRenderingEnabled) { + if ((info->ChipFamily < CHIP_FAMILY_RS400) + || (info->directRenderingEnabled) + ) { texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen); if (texturedAdaptor != NULL) { adaptors[num_adaptors++] = texturedAdaptor; |