From fb53eec72030721db2162e4ebb92823337901fca Mon Sep 17 00:00:00 2001
From: David Rosca <david.rosca@amd.com>
Date: Mon, 5 May 2025 09:10:35 +0200
Subject: [PATCH] radeonsi/uvd_enc: Remove unused stream_handle

Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34807>
---
 src/gallium/drivers/radeonsi/radeon_uvd_enc.c | 11 ++++-------
 src/gallium/drivers/radeonsi/radeon_uvd_enc.h |  2 --
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/radeon_uvd_enc.c b/src/gallium/drivers/radeonsi/radeon_uvd_enc.c
index 13a20095a93..eef436848c7 100644
--- a/src/gallium/drivers/radeonsi/radeon_uvd_enc.c
+++ b/src/gallium/drivers/radeonsi/radeon_uvd_enc.c
@@ -1088,9 +1088,8 @@ static void radeon_uvd_enc_begin_frame(struct pipe_video_codec *encoder,
       }
    }
 
-   if (!enc->stream_handle) {
+   if (!enc->si) {
       struct rvid_buffer fb;
-      enc->stream_handle = si_vid_alloc_stream_handle();
       enc->si = CALLOC_STRUCT(rvid_buffer);
       si_vid_create_buffer(enc->screen, enc->si, 128 * 1024, PIPE_USAGE_DEFAULT);
       si_vid_create_buffer(enc->screen, &fb, 4096, PIPE_USAGE_STAGING);
@@ -1208,17 +1207,15 @@ static void radeon_uvd_enc_destroy(struct pipe_video_codec *encoder)
 {
    struct radeon_uvd_encoder *enc = (struct radeon_uvd_encoder *)encoder;
 
-   if (enc->stream_handle) {
+   if (enc->si) {
       struct rvid_buffer fb;
       enc->need_feedback = false;
       si_vid_create_buffer(enc->screen, &fb, 512, PIPE_USAGE_STAGING);
       enc->fb = &fb;
       destroy(enc);
       flush(enc, PIPE_FLUSH_ASYNC, NULL);
-      if (enc->si) {
-         si_vid_destroy_buffer(enc->si);
-         FREE(enc->si);
-      }
+      si_vid_destroy_buffer(enc->si);
+      FREE(enc->si);
       si_vid_destroy_buffer(&fb);
    }
 
diff --git a/src/gallium/drivers/radeonsi/radeon_uvd_enc.h b/src/gallium/drivers/radeonsi/radeon_uvd_enc.h
index be2a33ba2df..a0391dc9302 100644
--- a/src/gallium/drivers/radeonsi/radeon_uvd_enc.h
+++ b/src/gallium/drivers/radeonsi/radeon_uvd_enc.h
@@ -338,8 +338,6 @@ struct radeon_uvd_enc_pic {
 struct radeon_uvd_encoder {
    struct pipe_video_codec base;
 
-   unsigned stream_handle;
-
    struct pipe_screen *screen;
    struct radeon_winsys *ws;
    struct radeon_cmdbuf cs;