fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi/vce: deal with has_gfx_compute being false

Browse source 
In this case the workaround can't be implemented so we must
report a failure.

Reviewed-by: David Rosca <david.rosca@amd.com>
Reviewed-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41133>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2026-05-04 11:40:29 +02:00
parent 6e2d8c04be
commit b819ad62c2
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/gallium/drivers/radeonsi/radeon_vce.c
View file

@ -773,19 +773,24 @@ static void rvce_begin_frame(struct pipe_video_codec *encoder, struct pipe_video
* imports external buffer it may not be aligned and then we need to blit
* into internal surface used as input surface. */
if (source->height % 16) {
enc->source_copy = enc->base.context->create_video_buffer(enc->base.context, source);
assert(enc->source_copy);
struct vl_video_buffer *dst = (struct vl_video_buffer *)enc->source_copy;
for (unsigned i = 0; i < 2; i++) {
struct pipe_box box = {
.width = util_format_get_plane_width(source->buffer_format, i, source->width),
.height = util_format_get_plane_height(source->buffer_format, i, source->height),
.depth = 1,
};
si_resource_copy_region(enc->base.context, dst->resources[i], 0, 0, 0, 0, vid_buf->resources[i], 0, &box);
if (si_screen(enc->screen)->has_gfx_compute) {
enc->source_copy = enc->base.context->create_video_buffer(enc->base.context, source);
assert(enc->source_copy);
struct vl_video_buffer *dst = (struct vl_video_buffer *)enc->source_copy;
for (unsigned i = 0; i < 2; i++) {
struct pipe_box box = {
.width = util_format_get_plane_width(source->buffer_format, i, source->width),
.height = util_format_get_plane_height(source->buffer_format, i, source->height),
.depth = 1,
};
si_resource_copy_region(enc->base.context, dst->resources[i], 0, 0, 0, 0, vid_buf->resources[i], 0, &box);
}
enc->base.context->flush(enc->base.context, NULL, 0);
vid_buf = (struct vl_video_buffer *)enc->source_copy;
} else {
RVID_ERR("VDE requires 16x16 aligned input surface\n");
enc->error = true;
}
enc->base.context->flush(enc->base.context, NULL, 0);
vid_buf = (struct vl_video_buffer *)enc->source_copy;
}
enc->get_buffer(vid_buf->resources[0], &enc->handle, &enc->luma);
@ -933,6 +938,9 @@ static int rvce_end_frame(struct pipe_video_codec *encoder, struct pipe_video_bu
{
struct rvce_encoder *enc = (struct rvce_encoder *)encoder;
if (enc->error)
return 1;
flush(enc, picture->flush_flags, picture->out_fence);
if (enc->source_copy) {

1
src/gallium/drivers/radeonsi/radeon_vce.h
View file

@ -328,6 +328,7 @@ struct rvce_encoder {
bool use_vm;
bool dual_pipe;
bool error;
unsigned fw_version;
};