radeon/vcn: add ib implementations

Implement required ibs and command buffer submission interfaces for vcn encode

Signed-off-by: Boyuan Zhang <boyuan.zhang@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>

diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c b/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c
index ffd1155aeb896e5e6044c89bd6f9d6b6f1c6ef4c..f75f3d63af49ea4b039324356820b4be3d81ae2f 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c
+++ b/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c
@@ -65,121 +65,365 @@ static void radeon_enc_add_buffer(struct radeon_encoder *enc, struct pb_buffer *
 
 static void radeon_enc_session_info(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       unsigned int interface_version = ((RENCODE_FW_INTERFACE_MAJOR_VERSION << RENCODE_IF_MAJOR_VERSION_SHIFT) |
+                                                                         (RENCODE_FW_INTERFACE_MINOR_VERSION << RENCODE_IF_MINOR_VERSION_SHIFT));
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_SESSION_INFO);
+       RADEON_ENC_CS(interface_version);
+       RADEON_ENC_READWRITE(enc->si->res->buf, enc->si->res->domains, 0x0);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_task_info(struct radeon_encoder *enc, bool need_feedback)
 {
-       /* TODO*/
+       enc->enc_pic.task_info.task_id++;
+
+       if (need_feedback)
+               enc->enc_pic.task_info.allowed_max_num_feedbacks = 1;
+       else
+               enc->enc_pic.task_info.allowed_max_num_feedbacks = 0;
+
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_TASK_INFO);
+       enc->p_task_size = &enc->cs->current.buf[enc->cs->current.cdw++];
+       RADEON_ENC_CS(enc->enc_pic.task_info.task_id);
+       RADEON_ENC_CS(enc->enc_pic.task_info.allowed_max_num_feedbacks);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_session_init(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       enc->enc_pic.session_init.encode_standard = RENCODE_ENCODE_STANDARD_H264;
+       enc->enc_pic.session_init.aligned_picture_width = align(enc->base.width, 16);
+       enc->enc_pic.session_init.aligned_picture_height = align(enc->base.height, 16);
+       enc->enc_pic.session_init.padding_width = enc->enc_pic.session_init.aligned_picture_width - enc->base.width;
+       enc->enc_pic.session_init.padding_height = enc->enc_pic.session_init.aligned_picture_height - enc->base.height;
+       enc->enc_pic.session_init.pre_encode_mode = RENCODE_PREENCODE_MODE_NONE;
+       enc->enc_pic.session_init.pre_encode_chroma_enabled = false;
+
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_SESSION_INIT);
+       RADEON_ENC_CS(enc->enc_pic.session_init.encode_standard);
+       RADEON_ENC_CS(enc->enc_pic.session_init.aligned_picture_width);
+       RADEON_ENC_CS(enc->enc_pic.session_init.aligned_picture_height);
+       RADEON_ENC_CS(enc->enc_pic.session_init.padding_width);
+       RADEON_ENC_CS(enc->enc_pic.session_init.padding_height);
+       RADEON_ENC_CS(enc->enc_pic.session_init.pre_encode_mode);
+       RADEON_ENC_CS(enc->enc_pic.session_init.pre_encode_chroma_enabled);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_layer_control(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       enc->enc_pic.layer_ctrl.max_num_temporal_layers = 1;
+       enc->enc_pic.layer_ctrl.num_temporal_layers = 1;
+
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_LAYER_CONTROL);
+       RADEON_ENC_CS(enc->enc_pic.layer_ctrl.max_num_temporal_layers);
+       RADEON_ENC_CS(enc->enc_pic.layer_ctrl.num_temporal_layers);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_layer_select(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       enc->enc_pic.layer_sel.temporal_layer_index = 0;
+
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_LAYER_SELECT);
+       RADEON_ENC_CS(enc->enc_pic.layer_sel.temporal_layer_index);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_slice_control(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       enc->enc_pic.slice_ctrl.slice_control_mode = RENCODE_H264_SLICE_CONTROL_MODE_FIXED_MBS;
+       enc->enc_pic.slice_ctrl.num_mbs_per_slice = align(enc->base.width, 16) / 16 * align(enc->base.height, 16) / 16;
+
+       RADEON_ENC_BEGIN(RENCODE_H264_IB_PARAM_SLICE_CONTROL);
+       RADEON_ENC_CS(enc->enc_pic.slice_ctrl.slice_control_mode);
+       RADEON_ENC_CS(enc->enc_pic.slice_ctrl.num_mbs_per_slice);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_spec_misc(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       enc->enc_pic.spec_misc.constrained_intra_pred_flag = 0;
+       enc->enc_pic.spec_misc.cabac_enable = 0;
+       enc->enc_pic.spec_misc.cabac_init_idc = 0;
+       enc->enc_pic.spec_misc.half_pel_enabled = 1;
+       enc->enc_pic.spec_misc.quarter_pel_enabled = 1;
+       enc->enc_pic.spec_misc.profile_idc = profiles[enc->base.profile - PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE];
+       enc->enc_pic.spec_misc.level_idc = enc->base.level;
+
+       RADEON_ENC_BEGIN(RENCODE_H264_IB_PARAM_SPEC_MISC);
+       RADEON_ENC_CS(enc->enc_pic.spec_misc.constrained_intra_pred_flag);
+       RADEON_ENC_CS(enc->enc_pic.spec_misc.cabac_enable);
+       RADEON_ENC_CS(enc->enc_pic.spec_misc.cabac_init_idc);
+       RADEON_ENC_CS(enc->enc_pic.spec_misc.half_pel_enabled);
+       RADEON_ENC_CS(enc->enc_pic.spec_misc.quarter_pel_enabled);
+       RADEON_ENC_CS(enc->enc_pic.spec_misc.profile_idc);
+       RADEON_ENC_CS(enc->enc_pic.spec_misc.level_idc);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_rc_session_init(struct radeon_encoder *enc, struct pipe_h264_enc_picture_desc *pic)
 {
-       /* TODO*/
+       switch(pic->rate_ctrl.rate_ctrl_method) {
+               case PIPE_H264_ENC_RATE_CONTROL_METHOD_DISABLE:
+                       enc->enc_pic.rc_session_init.rate_control_method = RENCODE_RATE_CONTROL_METHOD_NONE;
+                       break;
+               case PIPE_H264_ENC_RATE_CONTROL_METHOD_CONSTANT_SKIP:
+               case PIPE_H264_ENC_RATE_CONTROL_METHOD_CONSTANT:
+                       enc->enc_pic.rc_session_init.rate_control_method = RENCODE_RATE_CONTROL_METHOD_CBR;
+                       break;
+               case PIPE_H264_ENC_RATE_CONTROL_METHOD_VARIABLE_SKIP:
+               case PIPE_H264_ENC_RATE_CONTROL_METHOD_VARIABLE:
+                       enc->enc_pic.rc_session_init.rate_control_method = RENCODE_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR;
+                       break;
+               default:
+                       enc->enc_pic.rc_session_init.rate_control_method = RENCODE_RATE_CONTROL_METHOD_NONE;
+       }
+
+       enc->enc_pic.rc_session_init.vbv_buffer_level = pic->rate_ctrl.vbv_buf_lv;
+
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_RATE_CONTROL_SESSION_INIT);
+       RADEON_ENC_CS(enc->enc_pic.rc_session_init.rate_control_method);
+       RADEON_ENC_CS(enc->enc_pic.rc_session_init.vbv_buffer_level);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_rc_layer_init(struct radeon_encoder *enc, struct pipe_h264_enc_picture_desc *pic)
 {
-       /* TODO*/
+       enc->enc_pic.rc_layer_init.target_bit_rate = pic->rate_ctrl.target_bitrate;
+       enc->enc_pic.rc_layer_init.peak_bit_rate = pic->rate_ctrl.peak_bitrate;
+       enc->enc_pic.rc_layer_init.frame_rate_num = pic->rate_ctrl.frame_rate_num;
+       enc->enc_pic.rc_layer_init.frame_rate_den = pic->rate_ctrl.frame_rate_den;
+       enc->enc_pic.rc_layer_init.vbv_buffer_size = pic->rate_ctrl.vbv_buffer_size;
+       enc->enc_pic.rc_layer_init.avg_target_bits_per_picture = pic->rate_ctrl.target_bits_picture;
+       enc->enc_pic.rc_layer_init.peak_bits_per_picture_integer = pic->rate_ctrl.peak_bits_picture_integer;
+       enc->enc_pic.rc_layer_init.peak_bits_per_picture_fractional = pic->rate_ctrl.peak_bits_picture_fraction;
+
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_RATE_CONTROL_LAYER_INIT);
+       RADEON_ENC_CS(enc->enc_pic.rc_layer_init.target_bit_rate);
+       RADEON_ENC_CS(enc->enc_pic.rc_layer_init.peak_bit_rate);
+       RADEON_ENC_CS(enc->enc_pic.rc_layer_init.frame_rate_num);
+       RADEON_ENC_CS(enc->enc_pic.rc_layer_init.frame_rate_den);
+       RADEON_ENC_CS(enc->enc_pic.rc_layer_init.vbv_buffer_size);
+       RADEON_ENC_CS(enc->enc_pic.rc_layer_init.avg_target_bits_per_picture);
+       RADEON_ENC_CS(enc->enc_pic.rc_layer_init.peak_bits_per_picture_integer);
+       RADEON_ENC_CS(enc->enc_pic.rc_layer_init.peak_bits_per_picture_fractional);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_deblocking_filter_h264(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       enc->enc_pic.h264_deblock.disable_deblocking_filter_idc = 0;
+       enc->enc_pic.h264_deblock.alpha_c0_offset_div2 = 0;
+       enc->enc_pic.h264_deblock.beta_offset_div2 = 0;
+       enc->enc_pic.h264_deblock.cb_qp_offset = 0;
+       enc->enc_pic.h264_deblock.cr_qp_offset = 0;
+
+       RADEON_ENC_BEGIN(RENCODE_H264_IB_PARAM_DEBLOCKING_FILTER);
+       RADEON_ENC_CS(enc->enc_pic.h264_deblock.disable_deblocking_filter_idc);
+       RADEON_ENC_CS(enc->enc_pic.h264_deblock.alpha_c0_offset_div2);
+       RADEON_ENC_CS(enc->enc_pic.h264_deblock.beta_offset_div2);
+       RADEON_ENC_CS(enc->enc_pic.h264_deblock.cb_qp_offset);
+       RADEON_ENC_CS(enc->enc_pic.h264_deblock.cr_qp_offset);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_quality_params(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       enc->enc_pic.quality_params.vbaq_mode = 0;
+       enc->enc_pic.quality_params.scene_change_sensitivity = 0;
+       enc->enc_pic.quality_params.scene_change_min_idr_interval = 0;
+
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_QUALITY_PARAMS);
+       RADEON_ENC_CS(enc->enc_pic.quality_params.vbaq_mode);
+       RADEON_ENC_CS(enc->enc_pic.quality_params.scene_change_sensitivity);
+       RADEON_ENC_CS(enc->enc_pic.quality_params.scene_change_min_idr_interval);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_ctx(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       enc->enc_pic.ctx_buf.swizzle_mode = 0;
+       enc->enc_pic.ctx_buf.rec_luma_pitch = align(enc->base.width, enc->alignment);
+       enc->enc_pic.ctx_buf.rec_chroma_pitch = align(enc->base.width, enc->alignment);
+       enc->enc_pic.ctx_buf.num_reconstructed_pictures = 2;
+
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_ENCODE_CONTEXT_BUFFER);
+       RADEON_ENC_READWRITE(enc->cpb.res->buf, enc->cpb.res->domains, 0);
+       RADEON_ENC_CS(enc->enc_pic.ctx_buf.swizzle_mode);
+       RADEON_ENC_CS(enc->enc_pic.ctx_buf.rec_luma_pitch);
+       RADEON_ENC_CS(enc->enc_pic.ctx_buf.rec_chroma_pitch);
+       RADEON_ENC_CS(enc->enc_pic.ctx_buf.num_reconstructed_pictures);
+       /* reconstructed_picture_1_luma_offset */
+       RADEON_ENC_CS(0x00000000);
+       /* reconstructed_picture_1_chroma_offset */
+       RADEON_ENC_CS(align(enc->base.width, enc->alignment) * align(enc->base.height, 16));
+       /* reconstructed_picture_2_luma_offset */
+       RADEON_ENC_CS(align(enc->base.width, enc->alignment) * align(enc->base.height, 16) * 3 / 2);
+       /* reconstructed_picture_2_chroma_offset */
+       RADEON_ENC_CS(align(enc->base.width, enc->alignment) * align(enc->base.height, 16) * 5 / 2);
+
+       for (int i = 0; i < 136 ; i++)
+               RADEON_ENC_CS(0x00000000);
+
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_bitstream(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       enc->enc_pic.bit_buf.mode = RENCODE_REC_SWIZZLE_MODE_LINEAR;
+       enc->enc_pic.bit_buf.video_bitstream_buffer_size = enc->bs_size;
+       enc->enc_pic.bit_buf.video_bitstream_data_offset = 0;
+
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_VIDEO_BITSTREAM_BUFFER);
+       RADEON_ENC_CS(enc->enc_pic.bit_buf.mode);
+       RADEON_ENC_WRITE(enc->bs_handle, RADEON_DOMAIN_GTT, 0);
+       RADEON_ENC_CS(enc->enc_pic.bit_buf.video_bitstream_buffer_size);
+       RADEON_ENC_CS(enc->enc_pic.bit_buf.video_bitstream_data_offset);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_feedback(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       enc->enc_pic.fb_buf.mode = RENCODE_FEEDBACK_BUFFER_MODE_LINEAR;
+       enc->enc_pic.fb_buf.feedback_buffer_size = 16;
+       enc->enc_pic.fb_buf.feedback_data_size = 40;
+
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_FEEDBACK_BUFFER);
+       RADEON_ENC_CS(enc->enc_pic.fb_buf.mode);
+       RADEON_ENC_WRITE(enc->fb->res->buf, enc->fb->res->domains, 0x0);
+       RADEON_ENC_CS(enc->enc_pic.fb_buf.feedback_buffer_size);
+       RADEON_ENC_CS(enc->enc_pic.fb_buf.feedback_data_size);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_intra_refresh(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       enc->enc_pic.intra_ref.intra_refresh_mode = RENCODE_INTRA_REFRESH_MODE_NONE;
+       enc->enc_pic.intra_ref.offset = 0;
+       enc->enc_pic.intra_ref.region_size = 0;
+
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_INTRA_REFRESH);
+       RADEON_ENC_CS(enc->enc_pic.intra_ref.intra_refresh_mode);
+       RADEON_ENC_CS(enc->enc_pic.intra_ref.offset);
+       RADEON_ENC_CS(enc->enc_pic.intra_ref.region_size);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_rc_per_pic(struct radeon_encoder *enc, struct pipe_h264_enc_picture_desc *pic)
 {
-       /* TODO*/
+       enc->enc_pic.rc_per_pic.qp = pic->quant_i_frames;
+       enc->enc_pic.rc_per_pic.min_qp_app = 0;
+       enc->enc_pic.rc_per_pic.max_qp_app = 51;
+       enc->enc_pic.rc_per_pic.max_au_size = 0;
+       enc->enc_pic.rc_per_pic.enabled_filler_data = pic->rate_ctrl.fill_data_enable;
+       enc->enc_pic.rc_per_pic.skip_frame_enable = false;
+       enc->enc_pic.rc_per_pic.enforce_hrd = pic->rate_ctrl.enforce_hrd;
+
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_RATE_CONTROL_PER_PICTURE);
+       RADEON_ENC_CS(enc->enc_pic.rc_per_pic.qp);
+       RADEON_ENC_CS(enc->enc_pic.rc_per_pic.min_qp_app);
+       RADEON_ENC_CS(enc->enc_pic.rc_per_pic.max_qp_app);
+       RADEON_ENC_CS(enc->enc_pic.rc_per_pic.max_au_size);
+       RADEON_ENC_CS(enc->enc_pic.rc_per_pic.enabled_filler_data);
+       RADEON_ENC_CS(enc->enc_pic.rc_per_pic.skip_frame_enable);
+       RADEON_ENC_CS(enc->enc_pic.rc_per_pic.enforce_hrd);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_encode_params(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       switch(enc->enc_pic.picture_type) {
+               case PIPE_H264_ENC_PICTURE_TYPE_I:
+               case PIPE_H264_ENC_PICTURE_TYPE_IDR:
+                       enc->enc_pic.enc_params.pic_type = RENCODE_PICTURE_TYPE_I;
+                       break;
+               case PIPE_H264_ENC_PICTURE_TYPE_P:
+                       enc->enc_pic.enc_params.pic_type = RENCODE_PICTURE_TYPE_P;
+                       break;
+               case PIPE_H264_ENC_PICTURE_TYPE_SKIP:
+                       enc->enc_pic.enc_params.pic_type = RENCODE_PICTURE_TYPE_P_SKIP;
+                       break;
+               case PIPE_H264_ENC_PICTURE_TYPE_B:
+                       enc->enc_pic.enc_params.pic_type = RENCODE_PICTURE_TYPE_B;
+                       break;
+               default:
+                       enc->enc_pic.enc_params.pic_type = RENCODE_PICTURE_TYPE_I;
+       }
+
+       enc->enc_pic.enc_params.allowed_max_bitstream_size = enc->bs_size;
+       enc->enc_pic.enc_params.input_pic_luma_pitch = enc->luma->u.gfx9.surf_pitch;
+       enc->enc_pic.enc_params.input_pic_chroma_pitch = enc->chroma->u.gfx9.surf_pitch;
+       enc->enc_pic.enc_params.input_pic_swizzle_mode = RENCODE_INPUT_SWIZZLE_MODE_LINEAR;
+
+       if(enc->enc_pic.picture_type == PIPE_H264_ENC_PICTURE_TYPE_IDR)
+               enc->enc_pic.enc_params.reference_picture_index = 0xFFFFFFFF;
+       else
+               enc->enc_pic.enc_params.reference_picture_index = (enc->enc_pic.frame_num - 1) % 2;
+
+       enc->enc_pic.enc_params.reconstructed_picture_index = enc->enc_pic.frame_num % 2;
+
+       RADEON_ENC_BEGIN(RENCODE_IB_PARAM_ENCODE_PARAMS);
+       RADEON_ENC_CS(enc->enc_pic.enc_params.pic_type);
+       RADEON_ENC_CS(enc->enc_pic.enc_params.allowed_max_bitstream_size);
+       RADEON_ENC_READ(enc->handle, RADEON_DOMAIN_VRAM, enc->luma->u.gfx9.surf_offset);
+       RADEON_ENC_READ(enc->handle, RADEON_DOMAIN_VRAM, enc->chroma->u.gfx9.surf_offset);
+       RADEON_ENC_CS(enc->enc_pic.enc_params.input_pic_luma_pitch);
+       RADEON_ENC_CS(enc->enc_pic.enc_params.input_pic_chroma_pitch);
+       RADEON_ENC_CS(enc->enc_pic.enc_params.input_pic_swizzle_mode);
+       RADEON_ENC_CS(enc->enc_pic.enc_params.reference_picture_index);
+       RADEON_ENC_CS(enc->enc_pic.enc_params.reconstructed_picture_index);
+       RADEON_ENC_END();
 }
 static void radeon_enc_encode_params_h264(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       enc->enc_pic.h264_enc_params.input_picture_structure = RENCODE_H264_PICTURE_STRUCTURE_FRAME;
+       enc->enc_pic.h264_enc_params.interlaced_mode = RENCODE_H264_INTERLACING_MODE_PROGRESSIVE;
+       enc->enc_pic.h264_enc_params.reference_picture_structure = RENCODE_H264_PICTURE_STRUCTURE_FRAME;
+       enc->enc_pic.h264_enc_params.reference_picture1_index = 0xFFFFFFFF;
+
+       RADEON_ENC_BEGIN(RENCODE_H264_IB_PARAM_ENCODE_PARAMS);
+       RADEON_ENC_CS(enc->enc_pic.h264_enc_params.input_picture_structure);
+       RADEON_ENC_CS(enc->enc_pic.h264_enc_params.interlaced_mode);
+       RADEON_ENC_CS(enc->enc_pic.h264_enc_params.reference_picture_structure);
+       RADEON_ENC_CS(enc->enc_pic.h264_enc_params.reference_picture1_index);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_op_init(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       RADEON_ENC_BEGIN(RENCODE_IB_OP_INITIALIZE);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_op_close(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       RADEON_ENC_BEGIN(RENCODE_IB_OP_CLOSE_SESSION);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_op_enc(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       RADEON_ENC_BEGIN(RENCODE_IB_OP_ENCODE);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_op_init_rc(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       RADEON_ENC_BEGIN(RENCODE_IB_OP_INIT_RC);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_op_init_rc_vbv(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       RADEON_ENC_BEGIN(RENCODE_IB_OP_INIT_RC_VBV_BUFFER_LEVEL);
+       RADEON_ENC_END();
 }
 
 static void radeon_enc_op_speed(struct radeon_encoder *enc)
 {
-       /* TODO*/
+       RADEON_ENC_BEGIN(RENCODE_IB_OP_SET_SPEED_ENCODING_MODE);
+       RADEON_ENC_END();
 }
 
 static void begin(struct radeon_encoder *enc, struct pipe_h264_enc_picture_desc *pic)