From: Boyuan Zhang Date: Wed, 13 Mar 2019 23:14:13 +0000 (-0400) Subject: radeon/vcn: update for new vcn enc interface X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=de99e0a5634ed8f225130c4841470c5d5a1ac24e;p=mesa.git radeon/vcn: update for new vcn enc interface Signed-off-by: Boyuan Zhang Acked-by: Bas Nieuwenhuizen --- diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc.h b/src/gallium/drivers/radeon/radeon_vcn_enc.h index e0a9576c2c1..fb800c3c6a3 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_enc.h +++ b/src/gallium/drivers/radeon/radeon_vcn_enc.h @@ -250,6 +250,7 @@ typedef struct rvcn_enc_quality_params_s uint32_t vbaq_mode; uint32_t scene_change_sensitivity; uint32_t scene_change_min_idr_interval; + uint32_t two_pass_search_center_map_mode; } rvcn_enc_quality_params_t; typedef struct rvcn_enc_direct_output_nalu_s diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c b/src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c index 9f010239383..dfad95a4dd9 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c +++ b/src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c @@ -36,7 +36,7 @@ #include "radeon_vcn_enc.h" #define RENCODE_FW_INTERFACE_MAJOR_VERSION 0 -#define RENCODE_FW_INTERFACE_MINOR_VERSION 0 +#define RENCODE_FW_INTERFACE_MINOR_VERSION 2 #define RENCODE_IB_PARAM_SESSION_INFO 0x00000001 #define RENCODE_IB_PARAM_TASK_INFO 0x00000002 @@ -71,11 +71,13 @@ static void radeon_enc_quality_params(struct radeon_encoder *enc) 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; + enc->enc_pic.quality_params.two_pass_search_center_map_mode = 0; RADEON_ENC_BEGIN(enc->cmd.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_CS(enc->enc_pic.quality_params.two_pass_search_center_map_mode); RADEON_ENC_END(); }