Attachment 145171 Details for Bug 111236 – si_video_buffer_create fixups

[patch] si_video_buffer_create fixups

si_vid_join_surfaces-fixups.diff (text/plain), 1.55 KB, created by Michel Dänzer on 2019-08-26 16:34:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2019-08-26 16:34:02 UTC

Size: 1.55 KB

patch

obsolete

>diff --git a/src/gallium/drivers/radeon/radeon_video.c b/src/gallium/drivers/radeon/radeon_video.c
>index 7777f888b05..31b28f76d3a 100644
>--- a/src/gallium/drivers/radeon/radeon_video.c
>+++ b/src/gallium/drivers/radeon/radeon_video.c
>@@ -178,6 +178,7 @@ void si_vid_join_surfaces(struct si_context *sctx,
> 				surfaces[i]->u.gfx9.offset[j] += off;
> 		}
> 
>+		surfaces[i]->flags |= RADEON_SURF_IMPORTED;
> 		off += surfaces[i]->surf_size;
> 	}
> 
>diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
>index be614e66440..6143a3bb7c7 100644
>--- a/src/gallium/drivers/radeonsi/si_texture.c
>+++ b/src/gallium/drivers/radeonsi/si_texture.c
>@@ -1913,6 +1913,7 @@ static bool si_can_invalidate_texture(struct si_screen *sscreen,
> 				      const struct pipe_box *box)
> {
> 	return !tex->buffer.b.is_shared &&
>+		!(tex->surface.flags & RADEON_SURF_IMPORTED) &&
> 		!(transfer_usage & PIPE_TRANSFER_READ) &&
> 		tex->buffer.b.b.last_level == 0 &&
> 		util_texrange_covers_whole_level(&tex->buffer.b.b, 0,
>diff --git a/src/gallium/drivers/radeonsi/si_uvd.c b/src/gallium/drivers/radeonsi/si_uvd.c
>index 94d81a4ab6c..19d1b09f1c1 100644
>--- a/src/gallium/drivers/radeonsi/si_uvd.c
>+++ b/src/gallium/drivers/radeonsi/si_uvd.c
>@@ -96,6 +96,7 @@ struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe,
> 		/* reset the address */
> 		resources[i]->buffer.gpu_address = ctx->ws->buffer_get_virtual_address(
> 			resources[i]->buffer.buf);
>+		resources[i]->buffer.bo_size = resources[i]->buffer.buf->size;
> 	}
> 
> 	vidtemplate.height *= array_size;

Actions: View | Splinter Review

Attachments on bug 111236: 145171

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.