AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi/uvd_enc: Implement fence_wait

Browse Source 
Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31872>
This commit is contained in:
David Rosca
2024-09-30 13:55:49 +02:00
committed by Marge Bot
parent e69aba2cde
commit 375ecea7b5
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/radeonsi/radeon_uvd_enc.c
+16 -6
View File
@@ -114,15 +114,15 @@ static void radeon_uvd_enc_get_param(struct radeon_uvd_encoder *enc,
radeon_uvd_enc_get_vui_param(enc, pic);
}
static int flush(struct radeon_uvd_encoder *enc, unsigned flags)
static int flush(struct radeon_uvd_encoder *enc, unsigned flags, struct pipe_fence_handle **fence)
{
return enc->ws->cs_flush(&enc->cs, flags, NULL);
return enc->ws->cs_flush(&enc->cs, flags, fence);
}
static void radeon_uvd_enc_flush(struct pipe_video_codec *encoder)
{
struct radeon_uvd_encoder *enc = (struct radeon_uvd_encoder *)encoder;
flush(enc, PIPE_FLUSH_ASYNC);
flush(enc, PIPE_FLUSH_ASYNC, NULL);
}
static void radeon_uvd_enc_cs_flush(void *ctx, unsigned flags, struct pipe_fence_handle **fence)
@@ -225,7 +225,7 @@ static void radeon_uvd_enc_begin_frame(struct pipe_video_codec *encoder,
si_vid_create_buffer(enc->screen, &fb, 4096, PIPE_USAGE_STAGING);
enc->fb = &fb;
enc->begin(enc, picture);
flush(enc, PIPE_FLUSH_ASYNC);
flush(enc, PIPE_FLUSH_ASYNC, NULL);
si_vid_destroy_buffer(&fb);
}
}
@@ -254,7 +254,7 @@ static int radeon_uvd_enc_end_frame(struct pipe_video_codec *encoder,
struct pipe_picture_desc *picture)
{
struct radeon_uvd_encoder *enc = (struct radeon_uvd_encoder *)encoder;
return flush(enc, picture->flush_flags);
return flush(enc, picture->flush_flags, picture->fence);
}
static void radeon_uvd_enc_destroy(struct pipe_video_codec *encoder)
@@ -267,7 +267,7 @@ static void radeon_uvd_enc_destroy(struct pipe_video_codec *encoder)
si_vid_create_buffer(enc->screen, &fb, 512, PIPE_USAGE_STAGING);
enc->fb = &fb;
enc->destroy(enc);
flush(enc, PIPE_FLUSH_ASYNC);
flush(enc, PIPE_FLUSH_ASYNC, NULL);
if (enc->si) {
si_vid_destroy_buffer(enc->si);
FREE(enc->si);
@@ -301,6 +301,15 @@ static void radeon_uvd_enc_get_feedback(struct pipe_video_codec *encoder, void *
FREE(fb);
}
static int radeon_uvd_enc_fence_wait(struct pipe_video_codec *encoder,
struct pipe_fence_handle *fence,
uint64_t timeout)
{
struct radeon_uvd_encoder *enc = (struct radeon_uvd_encoder *)encoder;
return enc->ws->fence_wait(enc->ws, fence, timeout);
}
static void radeon_uvd_enc_destroy_fence(struct pipe_video_codec *encoder,
struct pipe_fence_handle *fence)
{
@@ -336,6 +345,7 @@ struct pipe_video_codec *radeon_uvd_create_encoder(struct pipe_context *context,
enc->base.end_frame = radeon_uvd_enc_end_frame;
enc->base.flush = radeon_uvd_enc_flush;
enc->base.get_feedback = radeon_uvd_enc_get_feedback;
enc->base.fence_wait = radeon_uvd_enc_fence_wait;
enc->base.destroy_fence = radeon_uvd_enc_destroy_fence;
enc->get_buffer = get_buffer;
enc->bits_in_shifter = 0;