From: Boyuan Zhang Date: Wed, 15 May 2019 19:05:21 +0000 (-0400) Subject: radeon/vcn: adding engine type for new fw interface X-Git-Tag: upstream/19.3.0~3975 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26099bc35de2a45c1434047c00ca0e1f02ef7acf;p=platform%2Fupstream%2Fmesa.git radeon/vcn: adding engine type for new fw interface Signed-off-by: Boyuan Zhang Reviewed-by: Leo Liu Acked-by: Samuel Pitoiset --- diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc.h b/src/gallium/drivers/radeon/radeon_vcn_enc.h index fb800c3..8edc903 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_enc.h +++ b/src/gallium/drivers/radeon/radeon_vcn_enc.h @@ -42,6 +42,8 @@ #define RENCODE_IF_MINOR_VERSION_MASK 0x0000FFFF #define RENCODE_IF_MINOR_VERSION_SHIFT 0 +#define RENCODE_ENGINE_TYPE_ENCODE 1 + #define RENCODE_ENCODE_STANDARD_HEVC 0 #define RENCODE_ENCODE_STANDARD_H264 1 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 9a47aff..a437add 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c +++ b/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c @@ -69,6 +69,7 @@ static void radeon_enc_session_info(struct radeon_encoder *enc) RADEON_ENC_BEGIN(enc->cmd.session_info); RADEON_ENC_CS(enc->enc_pic.session_info.interface_version); RADEON_ENC_READWRITE(enc->si->res->buf, enc->si->res->domains, 0x0); + RADEON_ENC_CS(RENCODE_ENGINE_TYPE_ENCODE); RADEON_ENC_END(); } 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 dfad95a..d2c6378 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c +++ b/src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c @@ -35,8 +35,8 @@ #include "radeon_video.h" #include "radeon_vcn_enc.h" -#define RENCODE_FW_INTERFACE_MAJOR_VERSION 0 -#define RENCODE_FW_INTERFACE_MINOR_VERSION 2 +#define RENCODE_FW_INTERFACE_MAJOR_VERSION 1 +#define RENCODE_FW_INTERFACE_MINOR_VERSION 1 #define RENCODE_IB_PARAM_SESSION_INFO 0x00000001 #define RENCODE_IB_PARAM_TASK_INFO 0x00000002