diff options
| author | Boyuan Zhang <[email protected]> | 2019-05-15 15:05:21 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-07-19 20:16:33 -0400 |
| commit | 26099bc35de2a45c1434047c00ca0e1f02ef7acf (patch) | |
| tree | ea6df6bdd16795b5e71e826b2d49d3dc0d8c2168 | |
| parent | 936e9fa9515d7ac22dc778701b52ff02ac350043 (diff) | |
radeon/vcn: adding engine type for new fw interface
Signed-off-by: Boyuan Zhang <[email protected]>
Reviewed-by: Leo Liu <[email protected]>
Acked-by: Samuel Pitoiset <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_vcn_enc.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c | 1 | ||||
| -rw-r--r-- | 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..8edc903f15e 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 |