radeon/vcn: adding engine type for new fw interface

Signed-off-by: Boyuan Zhang <boyuan.zhang@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Acked-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>

diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc.h b/src/gallium/drivers/radeon/radeon_vcn_enc.h
index fb800c3c6a3b949274c7bb3dbeda419ea3ec000e..8edc903f15edd96987fcac4dc2e2bdd01fa915d5 100644 (file)
--- 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 9a47affd14b5001716d2408ed413a9a59c20c324..a437add48eef087fc21561ad4e9831498a92ba16 100644 (file)
--- 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 dfad95a4dd981278f23029033790e5034fcc8f83..d2c6378a055543c81aaf55b8dff86e502fa833d7 100644 (file)
--- 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