[Mesa-dev] [PATCH] radeon/vcn: adding engine type for new fw interface

[Liu, Leo]

Reviewed-by Leo Liu <leo.liu at amd.com>

On 2019-07-11 5:56 p.m., boyuan.zhang at amd.com wrote:
> From: Boyuan Zhang <boyuan.zhang at amd.com>
>
> Signed-off-by: Boyuan Zhang <boyuan.zhang at amd.com>
> ---
>   src/gallium/drivers/radeon/radeon_vcn_enc.h     | 2 ++
>   src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c | 1 +
>   src/gallium/drivers/radeon/radeon_vcn_enc_2_0.c | 4 ++--
>   3 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc.h b/src/gallium/drivers/radeon/radeon_vcn_enc.h
> index fb800c3c6a3..bcff114ff18 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 9a47affd14b..a437add48ee 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 dfad95a4dd9..d2c6378a055 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