[PATCH] radeon: add glamor Xv support

[Michel Dänzer]

On Don, 2013-09-26 at 17:45 -0400, Alex Deucher wrote:
> diff --git a/src/radeon_video.c b/src/radeon_video.c
> index 56cd9ab..5bd2190 100644
> --- a/src/radeon_video.c
> +++ b/src/radeon_video.c
> @@ -16,6 +16,8 @@
>  #include "xf86.h"
>  #include "dixstruct.h"
>  
> +#include <glamor.h>
> +
>  /* DPMS */
>  #ifdef HAVE_XEXTPROTO_71
>  #include <X11/extensions/dpmsconst.h>
> @@ -165,9 +167,15 @@ void RADEONInitVideo(ScreenPtr pScreen)
>      memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
>      adaptors = newAdaptors;
>  
> -    if ((info->ChipFamily < CHIP_FAMILY_RS400)
> -	|| (info->directRenderingEnabled)
> -	) {
> +    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 if ((info->ChipFamily < CHIP_FAMILY_RS400)
> +	       || info->directRenderingEnabled) {
>  	texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
>  	if (texturedAdaptor != NULL) {
>  	    adaptors[num_adaptors++] = texturedAdaptor;

I think the #include and glamor API calls need to be guarded by
USE_GLAMOR. With that fixed,

Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

As is the other patch.


-- 
Earthling Michel Dänzer            |                  http://www.amd.com
Libre software enthusiast          |                Mesa and X developer