X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fradeon%2Fradeon_vce.c;h=da831015e3b632988102ccbcb1a2751631f546b5;hb=58fd1d7ecd38daf5bcbaa225175b43b8c722b0d0;hp=30705c1caef243e28005fd0b5310787374f72d81;hpb=a48bf02d053fb3db88e9fe50764728657d78214a;p=mesa.git

diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c
index 30705c1caef..da831015e3b 100644
--- a/src/gallium/drivers/radeon/radeon_vce.c
+++ b/src/gallium/drivers/radeon/radeon_vce.c
@@ -25,42 +25,35 @@
  *
  **************************************************************************/
 
-/*
- * Authors:
- *      Christian König <christian.koenig@amd.com>
- *
- */
-
-#include <stdio.h>
+#include "radeon_vce.h"
 
 #include "pipe/p_video_codec.h"
-
-#include "util/u_video.h"
+#include "radeon_video.h"
+#include "radeonsi/si_pipe.h"
 #include "util/u_memory.h"
-
+#include "util/u_video.h"
 #include "vl/vl_video_buffer.h"
 
-#include "r600_pipe_common.h"
-#include "radeon_video.h"
-#include "radeon_vce.h"
+#include <stdio.h>
 
-#define FW_40_2_2 ((40 << 24) | (2 << 16) | (2 << 8))
-#define FW_50_0_1 ((50 << 24) | (0 << 16) | (1 << 8))
-#define FW_50_1_2 ((50 << 24) | (1 << 16) | (2 << 8))
+#define FW_40_2_2  ((40 << 24) | (2 << 16) | (2 << 8))
+#define FW_50_0_1  ((50 << 24) | (0 << 16) | (1 << 8))
+#define FW_50_1_2  ((50 << 24) | (1 << 16) | (2 << 8))
 #define FW_50_10_2 ((50 << 24) | (10 << 16) | (2 << 8))
 #define FW_50_17_3 ((50 << 24) | (17 << 16) | (3 << 8))
-#define FW_52_0_3 ((52 << 24) | (0 << 16) | (3 << 8))
-#define FW_52_4_3 ((52 << 24) | (4 << 16) | (3 << 8))
-#define FW_52_8_3 ((52 << 24) | (8 << 16) | (3 << 8))
+#define FW_52_0_3  ((52 << 24) | (0 << 16) | (3 << 8))
+#define FW_52_4_3  ((52 << 24) | (4 << 16) | (3 << 8))
+#define FW_52_8_3  ((52 << 24) | (8 << 16) | (3 << 8))
+#define FW_53      (53 << 24)
 
 /**
  * flush commands to the hardware
  */
 static void flush(struct rvce_encoder *enc)
 {
-	enc->ws->cs_flush(enc->cs, RADEON_FLUSH_ASYNC, NULL);
-	enc->task_info_idx = 0;
-	enc->bs_idx = 0;
+   enc->ws->cs_flush(enc->cs, PIPE_FLUSH_ASYNC, NULL);
+   enc->task_info_idx = 0;
+   enc->bs_idx = 0;
 }
 
 #if 0
@@ -94,17 +87,17 @@ static void dump_feedback(struct rvce_encoder *enc, struct rvid_buffer *fb)
  */
 static void reset_cpb(struct rvce_encoder *enc)
 {
-	unsigned i;
-
-	LIST_INITHEAD(&enc->cpb_slots);
-	for (i = 0; i < enc->cpb_num; ++i) {
-		struct rvce_cpb_slot *slot = &enc->cpb_array[i];
-		slot->index = i;
-		slot->picture_type = PIPE_H264_ENC_PICTURE_TYPE_SKIP;
-		slot->frame_num = 0;
-		slot->pic_order_cnt = 0;
-		LIST_ADDTAIL(&slot->list, &enc->cpb_slots);
-	}
+   unsigned i;
+
+   list_inithead(&enc->cpb_slots);
+   for (i = 0; i < enc->cpb_num; ++i) {
+      struct rvce_cpb_slot *slot = &enc->cpb_array[i];
+      slot->index = i;
+      slot->picture_type = PIPE_H264_ENC_PICTURE_TYPE_SKIP;
+      slot->frame_num = 0;
+      slot->pic_order_cnt = 0;
+      list_addtail(&slot->list, &enc->cpb_slots);
+   }
 }
 
 /**
@@ -112,32 +105,31 @@ static void reset_cpb(struct rvce_encoder *enc)
  */
 static void sort_cpb(struct rvce_encoder *enc)
 {
-	struct rvce_cpb_slot *i, *l0 = NULL, *l1 = NULL;
+   struct rvce_cpb_slot *i, *l0 = NULL, *l1 = NULL;
 
-	LIST_FOR_EACH_ENTRY(i, &enc->cpb_slots, list) {
-		if (i->frame_num == enc->pic.ref_idx_l0)
-			l0 = i;
+   LIST_FOR_EACH_ENTRY (i, &enc->cpb_slots, list) {
+      if (i->frame_num == enc->pic.ref_idx_l0)
+         l0 = i;
 
-		if (i->frame_num == enc->pic.ref_idx_l1)
-			l1 = i;
+      if (i->frame_num == enc->pic.ref_idx_l1)
+         l1 = i;
 
-		if (enc->pic.picture_type == PIPE_H264_ENC_PICTURE_TYPE_P && l0)
-			break;
+      if (enc->pic.picture_type == PIPE_H264_ENC_PICTURE_TYPE_P && l0)
+         break;
 
-		if (enc->pic.picture_type == PIPE_H264_ENC_PICTURE_TYPE_B &&
-		    l0 && l1)
-			break;
-	}
+      if (enc->pic.picture_type == PIPE_H264_ENC_PICTURE_TYPE_B && l0 && l1)
+         break;
+   }
 
-	if (l1) {
-		LIST_DEL(&l1->list);
-		LIST_ADD(&l1->list, &enc->cpb_slots);
-	}
+   if (l1) {
+      list_del(&l1->list);
+      list_add(&l1->list, &enc->cpb_slots);
+   }
 
-	if (l0) {
-		LIST_DEL(&l0->list);
-		LIST_ADD(&l0->list, &enc->cpb_slots);
-	}
+   if (l0) {
+      list_del(&l0->list);
+      list_add(&l0->list, &enc->cpb_slots);
+   }
 }
 
 /**
@@ -145,90 +137,99 @@ static void sort_cpb(struct rvce_encoder *enc)
  */
 static unsigned get_cpb_num(struct rvce_encoder *enc)
 {
-	unsigned w = align(enc->base.width, 16) / 16;
-	unsigned h = align(enc->base.height, 16) / 16;
-	unsigned dpb;
-
-	switch (enc->base.level) {
-	case 10:
-		dpb = 396;
-		break;
-	case 11:
-		dpb = 900;
-		break;
-	case 12:
-	case 13:
-	case 20:
-		dpb = 2376;
-		break;
-	case 21:
-		dpb = 4752;
-		break;
-	case 22:
-	case 30:
-		dpb = 8100;
-		break;
-	case 31:
-		dpb = 18000;
-		break;
-	case 32:
-		dpb = 20480;
-		break;
-	case 40:
-	case 41:
-		dpb = 32768;
-		break;
-	default:
-	case 42:
-		dpb = 34816;
-		break;
-	case 50:
-		dpb = 110400;
-		break;
-	case 51:
-		dpb = 184320;
-		break;
-	}
-
-	return MIN2(dpb / (w * h), 16);
+   unsigned w = align(enc->base.width, 16) / 16;
+   unsigned h = align(enc->base.height, 16) / 16;
+   unsigned dpb;
+
+   switch (enc->base.level) {
+   case 10:
+      dpb = 396;
+      break;
+   case 11:
+      dpb = 900;
+      break;
+   case 12:
+   case 13:
+   case 20:
+      dpb = 2376;
+      break;
+   case 21:
+      dpb = 4752;
+      break;
+   case 22:
+   case 30:
+      dpb = 8100;
+      break;
+   case 31:
+      dpb = 18000;
+      break;
+   case 32:
+      dpb = 20480;
+      break;
+   case 40:
+   case 41:
+      dpb = 32768;
+      break;
+   case 42:
+      dpb = 34816;
+      break;
+   case 50:
+      dpb = 110400;
+      break;
+   default:
+   case 51:
+   case 52:
+      dpb = 184320;
+      break;
+   }
+
+   return MIN2(dpb / (w * h), 16);
 }
 
 /**
  * Get the slot for the currently encoded frame
  */
-struct rvce_cpb_slot *current_slot(struct rvce_encoder *enc)
+struct rvce_cpb_slot *si_current_slot(struct rvce_encoder *enc)
 {
-	return LIST_ENTRY(struct rvce_cpb_slot, enc->cpb_slots.prev, list);
+   return LIST_ENTRY(struct rvce_cpb_slot, enc->cpb_slots.prev, list);
 }
 
 /**
  * Get the slot for L0
  */
-struct rvce_cpb_slot *l0_slot(struct rvce_encoder *enc)
+struct rvce_cpb_slot *si_l0_slot(struct rvce_encoder *enc)
 {
-	return LIST_ENTRY(struct rvce_cpb_slot, enc->cpb_slots.next, list);
+   return LIST_ENTRY(struct rvce_cpb_slot, enc->cpb_slots.next, list);
 }
 
 /**
  * Get the slot for L1
  */
-struct rvce_cpb_slot *l1_slot(struct rvce_encoder *enc)
+struct rvce_cpb_slot *si_l1_slot(struct rvce_encoder *enc)
 {
-	return LIST_ENTRY(struct rvce_cpb_slot, enc->cpb_slots.next->next, list);
+   return LIST_ENTRY(struct rvce_cpb_slot, enc->cpb_slots.next->next, list);
 }
 
 /**
  * Calculate the offsets into the CPB
  */
-void rvce_frame_offset(struct rvce_encoder *enc, struct rvce_cpb_slot *slot,
-		       signed *luma_offset, signed *chroma_offset)
+void si_vce_frame_offset(struct rvce_encoder *enc, struct rvce_cpb_slot *slot, signed *luma_offset,
+                         signed *chroma_offset)
 {
-	unsigned pitch = align(enc->luma->level[0].pitch_bytes, 128);
-	unsigned vpitch = align(enc->luma->npix_y, 16);
-	unsigned fsize = pitch * (vpitch + vpitch / 2);
-
-	*luma_offset = slot->index * fsize;
-	*chroma_offset = *luma_offset + pitch * vpitch;
+   struct si_screen *sscreen = (struct si_screen *)enc->screen;
+   unsigned pitch, vpitch, fsize;
+
+   if (sscreen->info.chip_class < GFX9) {
+      pitch = align(enc->luma->u.legacy.level[0].nblk_x * enc->luma->bpe, 128);
+      vpitch = align(enc->luma->u.legacy.level[0].nblk_y, 16);
+   } else {
+      pitch = align(enc->luma->u.gfx9.surf_pitch * enc->luma->bpe, 256);
+      vpitch = align(enc->luma->u.gfx9.surf_height, 16);
+   }
+   fsize = pitch * (vpitch + vpitch / 2);
+
+   *luma_offset = slot->index * fsize;
+   *chroma_offset = *luma_offset + pitch * vpitch;
 }
 
 /**
@@ -236,132 +237,128 @@ void rvce_frame_offset(struct rvce_encoder *enc, struct rvce_cpb_slot *slot,
  */
 static void rvce_destroy(struct pipe_video_codec *encoder)
 {
-	struct rvce_encoder *enc = (struct rvce_encoder*)encoder;
-	if (enc->stream_handle) {
-		struct rvid_buffer fb;
-		rvid_create_buffer(enc->screen, &fb, 512, PIPE_USAGE_STAGING);
-		enc->fb = &fb;
-		enc->session(enc);
-		enc->feedback(enc);
-		enc->destroy(enc);
-		flush(enc);
-		rvid_destroy_buffer(&fb);
-	}
-	rvid_destroy_buffer(&enc->cpb);
-	enc->ws->cs_destroy(enc->cs);
-	FREE(enc->cpb_array);
-	FREE(enc);
+   struct rvce_encoder *enc = (struct rvce_encoder *)encoder;
+   if (enc->stream_handle) {
+      struct rvid_buffer fb;
+      si_vid_create_buffer(enc->screen, &fb, 512, PIPE_USAGE_STAGING);
+      enc->fb = &fb;
+      enc->session(enc);
+      enc->destroy(enc);
+      flush(enc);
+      si_vid_destroy_buffer(&fb);
+   }
+   si_vid_destroy_buffer(&enc->cpb);
+   enc->ws->cs_destroy(enc->cs);
+   FREE(enc->cpb_array);
+   FREE(enc);
 }
 
-static void rvce_begin_frame(struct pipe_video_codec *encoder,
-			     struct pipe_video_buffer *source,
-			     struct pipe_picture_desc *picture)
+static void rvce_begin_frame(struct pipe_video_codec *encoder, struct pipe_video_buffer *source,
+                             struct pipe_picture_desc *picture)
 {
-	struct rvce_encoder *enc = (struct rvce_encoder*)encoder;
-	struct vl_video_buffer *vid_buf = (struct vl_video_buffer *)source;
-	struct pipe_h264_enc_picture_desc *pic = (struct pipe_h264_enc_picture_desc *)picture;
-
-	bool need_rate_control =
-		enc->pic.rate_ctrl.rate_ctrl_method != pic->rate_ctrl.rate_ctrl_method ||
-		enc->pic.quant_i_frames != pic->quant_i_frames ||
-		enc->pic.quant_p_frames != pic->quant_p_frames ||
-		enc->pic.quant_b_frames != pic->quant_b_frames;
-
-	enc->pic = *pic;
-	get_pic_param(enc, pic);
-
-	enc->get_buffer(vid_buf->resources[0], &enc->handle, &enc->luma);
-	enc->get_buffer(vid_buf->resources[1], NULL, &enc->chroma);
-
-	if (pic->picture_type == PIPE_H264_ENC_PICTURE_TYPE_IDR)
-		reset_cpb(enc);
-	else if (pic->picture_type == PIPE_H264_ENC_PICTURE_TYPE_P ||
-	         pic->picture_type == PIPE_H264_ENC_PICTURE_TYPE_B)
-		sort_cpb(enc);
-	
-	if (!enc->stream_handle) {
-		struct rvid_buffer fb;
-		enc->stream_handle = rvid_alloc_stream_handle();
-		rvid_create_buffer(enc->screen, &fb, 512, PIPE_USAGE_STAGING);
-		enc->fb = &fb;
-		enc->session(enc);
-		enc->create(enc);
-		enc->config(enc);
-		enc->feedback(enc);
-		flush(enc);
-		//dump_feedback(enc, &fb);
-		rvid_destroy_buffer(&fb);
-		need_rate_control = false;
-	}
-
-	if (need_rate_control) {
-		enc->session(enc);
-		enc->config(enc);
-		flush(enc);
-	}
+   struct rvce_encoder *enc = (struct rvce_encoder *)encoder;
+   struct vl_video_buffer *vid_buf = (struct vl_video_buffer *)source;
+   struct pipe_h264_enc_picture_desc *pic = (struct pipe_h264_enc_picture_desc *)picture;
+
+   bool need_rate_control =
+      enc->pic.rate_ctrl.rate_ctrl_method != pic->rate_ctrl.rate_ctrl_method ||
+      enc->pic.quant_i_frames != pic->quant_i_frames ||
+      enc->pic.quant_p_frames != pic->quant_p_frames ||
+      enc->pic.quant_b_frames != pic->quant_b_frames ||
+      enc->pic.rate_ctrl.target_bitrate != pic->rate_ctrl.target_bitrate;
+
+   enc->pic = *pic;
+   enc->si_get_pic_param(enc, pic);
+
+   enc->get_buffer(vid_buf->resources[0], &enc->handle, &enc->luma);
+   enc->get_buffer(vid_buf->resources[1], NULL, &enc->chroma);
+
+   if (pic->picture_type == PIPE_H264_ENC_PICTURE_TYPE_IDR)
+      reset_cpb(enc);
+   else if (pic->picture_type == PIPE_H264_ENC_PICTURE_TYPE_P ||
+            pic->picture_type == PIPE_H264_ENC_PICTURE_TYPE_B)
+      sort_cpb(enc);
+
+   if (!enc->stream_handle) {
+      struct rvid_buffer fb;
+      enc->stream_handle = si_vid_alloc_stream_handle();
+      si_vid_create_buffer(enc->screen, &fb, 512, PIPE_USAGE_STAGING);
+      enc->fb = &fb;
+      enc->session(enc);
+      enc->create(enc);
+      enc->config(enc);
+      enc->feedback(enc);
+      flush(enc);
+      // dump_feedback(enc, &fb);
+      si_vid_destroy_buffer(&fb);
+      need_rate_control = false;
+   }
+
+   if (need_rate_control) {
+      enc->session(enc);
+      enc->config(enc);
+      flush(enc);
+   }
 }
 
 static void rvce_encode_bitstream(struct pipe_video_codec *encoder,
-				  struct pipe_video_buffer *source,
-				  struct pipe_resource *destination,
-				  void **fb)
+                                  struct pipe_video_buffer *source,
+                                  struct pipe_resource *destination, void **fb)
 {
-	struct rvce_encoder *enc = (struct rvce_encoder*)encoder;
-	enc->get_buffer(destination, &enc->bs_handle, NULL);
-	enc->bs_size = destination->width0;
-
-	*fb = enc->fb = CALLOC_STRUCT(rvid_buffer);
-	if (!rvid_create_buffer(enc->screen, enc->fb, 512, PIPE_USAGE_STAGING)) {
-		RVID_ERR("Can't create feedback buffer.\n");
-		return;
-	}
-	if (!radeon_emitted(enc->cs, 0))
-		enc->session(enc);
-	enc->encode(enc);
-	enc->feedback(enc);
+   struct rvce_encoder *enc = (struct rvce_encoder *)encoder;
+   enc->get_buffer(destination, &enc->bs_handle, NULL);
+   enc->bs_size = destination->width0;
+
+   *fb = enc->fb = CALLOC_STRUCT(rvid_buffer);
+   if (!si_vid_create_buffer(enc->screen, enc->fb, 512, PIPE_USAGE_STAGING)) {
+      RVID_ERR("Can't create feedback buffer.\n");
+      return;
+   }
+   if (!radeon_emitted(enc->cs, 0))
+      enc->session(enc);
+   enc->encode(enc);
+   enc->feedback(enc);
 }
 
-static void rvce_end_frame(struct pipe_video_codec *encoder,
-			   struct pipe_video_buffer *source,
-			   struct pipe_picture_desc *picture)
+static void rvce_end_frame(struct pipe_video_codec *encoder, struct pipe_video_buffer *source,
+                           struct pipe_picture_desc *picture)
 {
-	struct rvce_encoder *enc = (struct rvce_encoder*)encoder;
-	struct rvce_cpb_slot *slot = LIST_ENTRY(
-		struct rvce_cpb_slot, enc->cpb_slots.prev, list);
-
-	if (!enc->dual_inst || enc->bs_idx > 1)
-		flush(enc);
-
-	/* update the CPB backtrack with the just encoded frame */
-	slot->picture_type = enc->pic.picture_type;
-	slot->frame_num = enc->pic.frame_num;
-	slot->pic_order_cnt = enc->pic.pic_order_cnt;
-	if (!enc->pic.not_referenced) {
-		LIST_DEL(&slot->list);
-		LIST_ADD(&slot->list, &enc->cpb_slots);
-	}
+   struct rvce_encoder *enc = (struct rvce_encoder *)encoder;
+   struct rvce_cpb_slot *slot = LIST_ENTRY(struct rvce_cpb_slot, enc->cpb_slots.prev, list);
+
+   if (!enc->dual_inst || enc->bs_idx > 1)
+      flush(enc);
+
+   /* update the CPB backtrack with the just encoded frame */
+   slot->picture_type = enc->pic.picture_type;
+   slot->frame_num = enc->pic.frame_num;
+   slot->pic_order_cnt = enc->pic.pic_order_cnt;
+   if (!enc->pic.not_referenced) {
+      list_del(&slot->list);
+      list_add(&slot->list, &enc->cpb_slots);
+   }
 }
 
-static void rvce_get_feedback(struct pipe_video_codec *encoder,
-			      void *feedback, unsigned *size)
+static void rvce_get_feedback(struct pipe_video_codec *encoder, void *feedback, unsigned *size)
 {
-	struct rvce_encoder *enc = (struct rvce_encoder*)encoder;
-	struct rvid_buffer *fb = feedback;
-
-	if (size) {
-		uint32_t *ptr = enc->ws->buffer_map(fb->res->buf, enc->cs, PIPE_TRANSFER_READ_WRITE);
-
-		if (ptr[1]) {
-			*size = ptr[4] - ptr[9];
-		} else {
-			*size = 0;
-		}
-
-		enc->ws->buffer_unmap(fb->res->buf);
-	}
-	//dump_feedback(enc, fb);
-	rvid_destroy_buffer(fb);
-	FREE(fb);
+   struct rvce_encoder *enc = (struct rvce_encoder *)encoder;
+   struct rvid_buffer *fb = feedback;
+
+   if (size) {
+      uint32_t *ptr = enc->ws->buffer_map(fb->res->buf, enc->cs,
+                                          PIPE_TRANSFER_READ_WRITE | RADEON_TRANSFER_TEMPORARY);
+
+      if (ptr[1]) {
+         *size = ptr[4] - ptr[9];
+      } else {
+         *size = 0;
+      }
+
+      enc->ws->buffer_unmap(fb->res->buf);
+   }
+   // dump_feedback(enc, fb);
+   si_vid_destroy_buffer(fb);
+   FREE(fb);
 }
 
 /**
@@ -369,188 +366,190 @@ static void rvce_get_feedback(struct pipe_video_codec *encoder,
  */
 static void rvce_flush(struct pipe_video_codec *encoder)
 {
-	struct rvce_encoder *enc = (struct rvce_encoder*)encoder;
+   struct rvce_encoder *enc = (struct rvce_encoder *)encoder;
 
-	flush(enc);
+   flush(enc);
 }
 
-static void rvce_cs_flush(void *ctx, unsigned flags,
-			  struct pipe_fence_handle **fence)
+static void rvce_cs_flush(void *ctx, unsigned flags, struct pipe_fence_handle **fence)
 {
-	// just ignored
+   // just ignored
 }
 
-struct pipe_video_codec *rvce_create_encoder(struct pipe_context *context,
-					     const struct pipe_video_codec *templ,
-					     struct radeon_winsys* ws,
-					     rvce_get_buffer get_buffer)
+struct pipe_video_codec *si_vce_create_encoder(struct pipe_context *context,
+                                               const struct pipe_video_codec *templ,
+                                               struct radeon_winsys *ws, rvce_get_buffer get_buffer)
 {
-	struct r600_common_screen *rscreen = (struct r600_common_screen *)context->screen;
-	struct r600_common_context *rctx = (struct r600_common_context*)context;
-	struct rvce_encoder *enc;
-	struct pipe_video_buffer *tmp_buf, templat = {};
-	struct radeon_surf *tmp_surf;
-	unsigned cpb_size;
-
-	if (!rscreen->info.vce_fw_version) {
-		RVID_ERR("Kernel doesn't supports VCE!\n");
-		return NULL;
-
-	} else if (!rvce_is_fw_version_supported(rscreen)) {
-		RVID_ERR("Unsupported VCE fw version loaded!\n");
-		return NULL;
-	}
-
-	enc = CALLOC_STRUCT(rvce_encoder);
-	if (!enc)
-		return NULL;
-
-	if (rscreen->info.drm_major == 3)
-		enc->use_vm = true;
-	if ((rscreen->info.drm_major == 2 && rscreen->info.drm_minor >= 42) ||
-            rscreen->info.drm_major == 3)
-		enc->use_vui = true;
-	if (rscreen->info.family >= CHIP_TONGA &&
-	    rscreen->info.family != CHIP_STONEY &&
-	    rscreen->info.family != CHIP_POLARIS11)
-		enc->dual_pipe = true;
-	/* TODO enable B frame with dual instance */
-	if ((rscreen->info.family >= CHIP_TONGA) &&
-		(templ->max_references == 1) &&
-		(rscreen->info.vce_harvest_config == 0))
-		enc->dual_inst = true;
-
-	enc->base = *templ;
-	enc->base.context = context;
-
-	enc->base.destroy = rvce_destroy;
-	enc->base.begin_frame = rvce_begin_frame;
-	enc->base.encode_bitstream = rvce_encode_bitstream;
-	enc->base.end_frame = rvce_end_frame;
-	enc->base.flush = rvce_flush;
-	enc->base.get_feedback = rvce_get_feedback;
-	enc->get_buffer = get_buffer;
-
-	enc->screen = context->screen;
-	enc->ws = ws;
-	enc->cs = ws->cs_create(rctx->ctx, RING_VCE, rvce_cs_flush, enc);
-	if (!enc->cs) {
-		RVID_ERR("Can't get command submission context.\n");
-		goto error;
-	}
-
-	templat.buffer_format = PIPE_FORMAT_NV12;
-	templat.chroma_format = PIPE_VIDEO_CHROMA_FORMAT_420;
-	templat.width = enc->base.width;
-	templat.height = enc->base.height;
-	templat.interlaced = false;
-	if (!(tmp_buf = context->create_video_buffer(context, &templat))) {
-		RVID_ERR("Can't create video buffer.\n");
-		goto error;
-	}
-
-	enc->cpb_num = get_cpb_num(enc);
-	if (!enc->cpb_num)
-		goto error;
-
-	get_buffer(((struct vl_video_buffer *)tmp_buf)->resources[0], NULL, &tmp_surf);
-	cpb_size = align(tmp_surf->level[0].pitch_bytes, 128);
-	cpb_size = cpb_size * align(tmp_surf->npix_y, 32);
-	cpb_size = cpb_size * 3 / 2;
-	cpb_size = cpb_size * enc->cpb_num;
-	if (enc->dual_pipe)
-		cpb_size +=  RVCE_MAX_AUX_BUFFER_NUM *
-			RVCE_MAX_BITSTREAM_OUTPUT_ROW_SIZE * 2;
-	tmp_buf->destroy(tmp_buf);
-	if (!rvid_create_buffer(enc->screen, &enc->cpb, cpb_size, PIPE_USAGE_DEFAULT)) {
-		RVID_ERR("Can't create CPB buffer.\n");
-		goto error;
-	}
-
-	enc->cpb_array = CALLOC(enc->cpb_num, sizeof(struct rvce_cpb_slot));
-	if (!enc->cpb_array)
-		goto error;
-
-	reset_cpb(enc);
-
-	switch (rscreen->info.vce_fw_version) {
-	case FW_40_2_2:
-		radeon_vce_40_2_2_init(enc);
-		get_pic_param = radeon_vce_40_2_2_get_param;
-		break;
-
-	case FW_50_0_1:
-	case FW_50_1_2:
-	case FW_50_10_2:
-	case FW_50_17_3:
-		radeon_vce_50_init(enc);
-		get_pic_param = radeon_vce_50_get_param;
-		break;
-
-	case FW_52_0_3:
-	case FW_52_4_3:
-	case FW_52_8_3:
-		radeon_vce_52_init(enc);
-		get_pic_param = radeon_vce_52_get_param;
-		break;
-
-	default:
-		goto error;
-	}
-
-	return &enc->base;
+   struct si_screen *sscreen = (struct si_screen *)context->screen;
+   struct si_context *sctx = (struct si_context *)context;
+   struct rvce_encoder *enc;
+   struct pipe_video_buffer *tmp_buf, templat = {};
+   struct radeon_surf *tmp_surf;
+   unsigned cpb_size;
+
+   if (!sscreen->info.vce_fw_version) {
+      RVID_ERR("Kernel doesn't supports VCE!\n");
+      return NULL;
+
+   } else if (!si_vce_is_fw_version_supported(sscreen)) {
+      RVID_ERR("Unsupported VCE fw version loaded!\n");
+      return NULL;
+   }
+
+   enc = CALLOC_STRUCT(rvce_encoder);
+   if (!enc)
+      return NULL;
+
+   if (sscreen->info.is_amdgpu)
+      enc->use_vm = true;
+   if ((!sscreen->info.is_amdgpu && sscreen->info.drm_minor >= 42) || sscreen->info.is_amdgpu)
+      enc->use_vui = true;
+   if (sscreen->info.family >= CHIP_TONGA && sscreen->info.family != CHIP_STONEY &&
+       sscreen->info.family != CHIP_POLARIS11 && sscreen->info.family != CHIP_POLARIS12 &&
+       sscreen->info.family != CHIP_VEGAM)
+      enc->dual_pipe = true;
+   /* TODO enable B frame with dual instance */
+   if ((sscreen->info.family >= CHIP_TONGA) && (templ->max_references == 1) &&
+       (sscreen->info.vce_harvest_config == 0))
+      enc->dual_inst = true;
+
+   enc->base = *templ;
+   enc->base.context = context;
+
+   enc->base.destroy = rvce_destroy;
+   enc->base.begin_frame = rvce_begin_frame;
+   enc->base.encode_bitstream = rvce_encode_bitstream;
+   enc->base.end_frame = rvce_end_frame;
+   enc->base.flush = rvce_flush;
+   enc->base.get_feedback = rvce_get_feedback;
+   enc->get_buffer = get_buffer;
+
+   enc->screen = context->screen;
+   enc->ws = ws;
+   enc->cs = ws->cs_create(sctx->ctx, RING_VCE, rvce_cs_flush, enc, false);
+   if (!enc->cs) {
+      RVID_ERR("Can't get command submission context.\n");
+      goto error;
+   }
+
+   templat.buffer_format = PIPE_FORMAT_NV12;
+   templat.width = enc->base.width;
+   templat.height = enc->base.height;
+   templat.interlaced = false;
+   if (!(tmp_buf = context->create_video_buffer(context, &templat))) {
+      RVID_ERR("Can't create video buffer.\n");
+      goto error;
+   }
+
+   enc->cpb_num = get_cpb_num(enc);
+   if (!enc->cpb_num)
+      goto error;
+
+   get_buffer(((struct vl_video_buffer *)tmp_buf)->resources[0], NULL, &tmp_surf);
+
+   cpb_size = (sscreen->info.chip_class < GFX9)
+                 ? align(tmp_surf->u.legacy.level[0].nblk_x * tmp_surf->bpe, 128) *
+                      align(tmp_surf->u.legacy.level[0].nblk_y, 32)
+                 :
+
+                 align(tmp_surf->u.gfx9.surf_pitch * tmp_surf->bpe, 256) *
+                    align(tmp_surf->u.gfx9.surf_height, 32);
+
+   cpb_size = cpb_size * 3 / 2;
+   cpb_size = cpb_size * enc->cpb_num;
+   if (enc->dual_pipe)
+      cpb_size += RVCE_MAX_AUX_BUFFER_NUM * RVCE_MAX_BITSTREAM_OUTPUT_ROW_SIZE * 2;
+   tmp_buf->destroy(tmp_buf);
+   if (!si_vid_create_buffer(enc->screen, &enc->cpb, cpb_size, PIPE_USAGE_DEFAULT)) {
+      RVID_ERR("Can't create CPB buffer.\n");
+      goto error;
+   }
+
+   enc->cpb_array = CALLOC(enc->cpb_num, sizeof(struct rvce_cpb_slot));
+   if (!enc->cpb_array)
+      goto error;
+
+   reset_cpb(enc);
+
+   switch (sscreen->info.vce_fw_version) {
+   case FW_40_2_2:
+      si_vce_40_2_2_init(enc);
+      break;
+
+   case FW_50_0_1:
+   case FW_50_1_2:
+   case FW_50_10_2:
+   case FW_50_17_3:
+      si_vce_50_init(enc);
+      break;
+
+   case FW_52_0_3:
+   case FW_52_4_3:
+   case FW_52_8_3:
+      si_vce_52_init(enc);
+      break;
+
+   default:
+      if ((sscreen->info.vce_fw_version & (0xff << 24)) >= FW_53) {
+         si_vce_52_init(enc);
+      } else
+         goto error;
+   }
+
+   return &enc->base;
 
 error:
-	if (enc->cs)
-		enc->ws->cs_destroy(enc->cs);
+   if (enc->cs)
+      enc->ws->cs_destroy(enc->cs);
 
-	rvid_destroy_buffer(&enc->cpb);
+   si_vid_destroy_buffer(&enc->cpb);
 
-	FREE(enc->cpb_array);
-	FREE(enc);
-	return NULL;
+   FREE(enc->cpb_array);
+   FREE(enc);
+   return NULL;
 }
 
 /**
  * check if kernel has the right fw version loaded
  */
-bool rvce_is_fw_version_supported(struct r600_common_screen *rscreen)
+bool si_vce_is_fw_version_supported(struct si_screen *sscreen)
 {
-	switch (rscreen->info.vce_fw_version) {
-	case FW_40_2_2:
-	case FW_50_0_1:
-	case FW_50_1_2:
-	case FW_50_10_2:
-	case FW_50_17_3:
-	case FW_52_0_3:
-	case FW_52_4_3:
-	case FW_52_8_3:
-		return true;
-	default:
-		return false;
-	}
+   switch (sscreen->info.vce_fw_version) {
+   case FW_40_2_2:
+   case FW_50_0_1:
+   case FW_50_1_2:
+   case FW_50_10_2:
+   case FW_50_17_3:
+   case FW_52_0_3:
+   case FW_52_4_3:
+   case FW_52_8_3:
+      return true;
+   default:
+      if ((sscreen->info.vce_fw_version & (0xff << 24)) >= FW_53)
+         return true;
+      else
+         return false;
+   }
 }
 
 /**
  * Add the buffer as relocation to the current command submission
  */
-void rvce_add_buffer(struct rvce_encoder *enc, struct pb_buffer *buf,
-                     enum radeon_bo_usage usage, enum radeon_bo_domain domain,
-                     signed offset)
+void si_vce_add_buffer(struct rvce_encoder *enc, struct pb_buffer *buf, enum radeon_bo_usage usage,
+                       enum radeon_bo_domain domain, signed offset)
 {
-	int reloc_idx;
-
-	reloc_idx = enc->ws->cs_add_buffer(enc->cs, buf, usage | RADEON_USAGE_SYNCHRONIZED,
-					   domain, RADEON_PRIO_VCE);
-	if (enc->use_vm) {
-		uint64_t addr;
-		addr = enc->ws->buffer_get_virtual_address(buf);
-		addr = addr + offset;
-		RVCE_CS(addr >> 32);
-		RVCE_CS(addr);
-	} else {
-		offset += enc->ws->buffer_get_virtual_address(buf);
-		RVCE_CS(reloc_idx * 4);
-		RVCE_CS(offset);
-	}
+   int reloc_idx;
+
+   reloc_idx = enc->ws->cs_add_buffer(enc->cs, buf, usage | RADEON_USAGE_SYNCHRONIZED, domain, 0);
+   if (enc->use_vm) {
+      uint64_t addr;
+      addr = enc->ws->buffer_get_virtual_address(buf);
+      addr = addr + offset;
+      RVCE_CS(addr >> 32);
+      RVCE_CS(addr);
+   } else {
+      offset += enc->ws->buffer_get_reloc_offset(buf);
+      RVCE_CS(reloc_idx * 4);
+      RVCE_CS(offset);
+   }
 }