[Mesa-dev] [PATCH 1/3] radeon/uvd: use PIPE_BIND_LINEAR for video surfaces

[Christian König]

Am 13.10.2013 18:08, schrieb Grigori Goronzy:
> This new bind flag forces linear storage, but does not have other
> side effects like R600_RESOURCE_FLAG_TRANSFER.

Reviewed and committed the whole patch set.

Thansk for the help,
Christian.

> ---
>   src/gallium/drivers/r600/r600_uvd.c         | 6 +++---
>   src/gallium/drivers/radeonsi/radeonsi_uvd.c | 8 ++++----
>   2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/src/gallium/drivers/r600/r600_uvd.c b/src/gallium/drivers/r600/r600_uvd.c
> index 05d2ad0..300bccb 100644
> --- a/src/gallium/drivers/r600/r600_uvd.c
> +++ b/src/gallium/drivers/r600/r600_uvd.c
> @@ -77,7 +77,7 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe,
>   
>   	vl_video_buffer_template(&templ, &template, resource_formats[0], 1, array_size, PIPE_USAGE_STATIC, 0);
>   	if (ctx->b.chip_class < EVERGREEN || tmpl->interlaced)
> -		templ.flags = R600_RESOURCE_FLAG_TRANSFER;
> +		templ.bind = PIPE_BIND_LINEAR;
>   	resources[0] = (struct r600_texture *)
>   		pipe->screen->resource_create(pipe->screen, &templ);
>   	if (!resources[0])
> @@ -86,7 +86,7 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe,
>   	if (resource_formats[1] != PIPE_FORMAT_NONE) {
>   		vl_video_buffer_template(&templ, &template, resource_formats[1], 1, array_size, PIPE_USAGE_STATIC, 1);
>   		if (ctx->b.chip_class < EVERGREEN || tmpl->interlaced)
> -			templ.flags = R600_RESOURCE_FLAG_TRANSFER;
> +			templ.bind = PIPE_BIND_LINEAR;
>   		resources[1] = (struct r600_texture *)
>   			pipe->screen->resource_create(pipe->screen, &templ);
>   		if (!resources[1])
> @@ -96,7 +96,7 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe,
>   	if (resource_formats[2] != PIPE_FORMAT_NONE) {
>   		vl_video_buffer_template(&templ, &template, resource_formats[2], 1, array_size, PIPE_USAGE_STATIC, 2);
>   		if (ctx->b.chip_class < EVERGREEN || tmpl->interlaced)
> -			templ.flags = R600_RESOURCE_FLAG_TRANSFER;
> +			templ.bind = PIPE_BIND_LINEAR;
>   		resources[2] = (struct r600_texture *)
>   			pipe->screen->resource_create(pipe->screen, &templ);
>   		if (!resources[2])
> diff --git a/src/gallium/drivers/radeonsi/radeonsi_uvd.c b/src/gallium/drivers/radeonsi/radeonsi_uvd.c
> index 1cb3be0..6ecb17c 100644
> --- a/src/gallium/drivers/radeonsi/radeonsi_uvd.c
> +++ b/src/gallium/drivers/radeonsi/radeonsi_uvd.c
> @@ -76,8 +76,8 @@ struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe
>   	template.height = align(tmpl->height / array_size, VL_MACROBLOCK_HEIGHT);
>   
>   	vl_video_buffer_template(&templ, &template, resource_formats[0], 1, array_size, PIPE_USAGE_STATIC, 0);
> -	/* TODO: Setting the transfer flag is only a workaround till we get tiling working */
> -	templ.flags = R600_RESOURCE_FLAG_TRANSFER;
> +	/* TODO: get tiling working */
> +	templ.bind = PIPE_BIND_LINEAR;
>   	resources[0] = (struct r600_texture *)
>   		pipe->screen->resource_create(pipe->screen, &templ);
>   	if (!resources[0])
> @@ -85,7 +85,7 @@ struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe
>   
>   	if (resource_formats[1] != PIPE_FORMAT_NONE) {
>   		vl_video_buffer_template(&templ, &template, resource_formats[1], 1, array_size, PIPE_USAGE_STATIC, 1);
> -		templ.flags = R600_RESOURCE_FLAG_TRANSFER;
> +		templ.bind = PIPE_BIND_LINEAR;
>   		resources[1] = (struct r600_texture *)
>   			pipe->screen->resource_create(pipe->screen, &templ);
>   		if (!resources[1])
> @@ -94,7 +94,7 @@ struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe
>   
>   	if (resource_formats[2] != PIPE_FORMAT_NONE) {
>   		vl_video_buffer_template(&templ, &template, resource_formats[2], 1, array_size, PIPE_USAGE_STATIC, 2);
> -		templ.flags = R600_RESOURCE_FLAG_TRANSFER;
> +		templ.bind = PIPE_BIND_LINEAR;
>   		resources[2] = (struct r600_texture *)
>   			pipe->screen->resource_create(pipe->screen, &templ);
>   		if (!resources[2])