radeon/vcn: move vcn1.0 specific defines to c

Signed-off-by: Boyuan Zhang <boyuan.zhang@amd.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/gallium/drivers/radeon/radeon_vcn_enc.h b/src/gallium/drivers/radeon/radeon_vcn_enc.h
index 9be03210e914eb2a7eecc4c900192ad623ad24af..db59a75cce423243af868f73864a9759f26cac9b 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_vcn_enc.h
+++ b/src/gallium/drivers/radeon/radeon_vcn_enc.h
@@ -28,35 +28,6 @@
 #ifndef _RADEON_VCN_ENC_H
 #define _RADEON_VCN_ENC_H
 
-#define RENCODE_FW_INTERFACE_MAJOR_VERSION             1
-#define RENCODE_FW_INTERFACE_MINOR_VERSION             2
-
-#define RENCODE_IB_PARAM_SESSION_INFO                          0x00000001
-#define RENCODE_IB_PARAM_TASK_INFO                             0x00000002
-#define RENCODE_IB_PARAM_SESSION_INIT                          0x00000003
-#define RENCODE_IB_PARAM_LAYER_CONTROL                         0x00000004
-#define RENCODE_IB_PARAM_LAYER_SELECT                          0x00000005
-#define RENCODE_IB_PARAM_RATE_CONTROL_SESSION_INIT             0x00000006
-#define RENCODE_IB_PARAM_RATE_CONTROL_LAYER_INIT               0x00000007
-#define RENCODE_IB_PARAM_RATE_CONTROL_PER_PICTURE              0x00000008
-#define RENCODE_IB_PARAM_QUALITY_PARAMS                        0x00000009
-#define RENCODE_IB_PARAM_SLICE_HEADER                          0x0000000a
-#define RENCODE_IB_PARAM_ENCODE_PARAMS                         0x0000000b
-#define RENCODE_IB_PARAM_INTRA_REFRESH                         0x0000000c
-#define RENCODE_IB_PARAM_ENCODE_CONTEXT_BUFFER                 0x0000000d
-#define RENCODE_IB_PARAM_VIDEO_BITSTREAM_BUFFER                0x0000000e
-#define RENCODE_IB_PARAM_FEEDBACK_BUFFER                       0x00000010
-#define RENCODE_IB_PARAM_DIRECT_OUTPUT_NALU                    0x00000020
-
-#define RENCODE_HEVC_IB_PARAM_SLICE_CONTROL                    0x00100001
-#define RENCODE_HEVC_IB_PARAM_SPEC_MISC                        0x00100002
-#define RENCODE_HEVC_IB_PARAM_DEBLOCKING_FILTER                0x00100003
-
-#define RENCODE_H264_IB_PARAM_SLICE_CONTROL                    0x00200001
-#define RENCODE_H264_IB_PARAM_SPEC_MISC                        0x00200002
-#define RENCODE_H264_IB_PARAM_ENCODE_PARAMS                    0x00200003
-#define RENCODE_H264_IB_PARAM_DEBLOCKING_FILTER                0x00200004
-
 #define RENCODE_IB_OP_INITIALIZE                               0x01000001
 #define RENCODE_IB_OP_CLOSE_SESSION                            0x01000002
 #define RENCODE_IB_OP_ENCODE                                   0x01000003

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 de357d9a3d3d7287abccd328dd0107e58171e880..d1dcfb1d7f99d83820b16723c8aa2331f90f82b0 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c
+++ b/src/gallium/drivers/radeon/radeon_vcn_enc_1_2.c
@@ -35,6 +35,35 @@
 #include "radeon_video.h"
 #include "radeon_vcn_enc.h"
 
+#define RENCODE_FW_INTERFACE_MAJOR_VERSION             1
+#define RENCODE_FW_INTERFACE_MINOR_VERSION             2
+
+#define RENCODE_IB_PARAM_SESSION_INFO                          0x00000001
+#define RENCODE_IB_PARAM_TASK_INFO                             0x00000002
+#define RENCODE_IB_PARAM_SESSION_INIT                          0x00000003
+#define RENCODE_IB_PARAM_LAYER_CONTROL                         0x00000004
+#define RENCODE_IB_PARAM_LAYER_SELECT                          0x00000005
+#define RENCODE_IB_PARAM_RATE_CONTROL_SESSION_INIT             0x00000006
+#define RENCODE_IB_PARAM_RATE_CONTROL_LAYER_INIT               0x00000007
+#define RENCODE_IB_PARAM_RATE_CONTROL_PER_PICTURE              0x00000008
+#define RENCODE_IB_PARAM_QUALITY_PARAMS                        0x00000009
+#define RENCODE_IB_PARAM_SLICE_HEADER                          0x0000000a
+#define RENCODE_IB_PARAM_ENCODE_PARAMS                         0x0000000b
+#define RENCODE_IB_PARAM_INTRA_REFRESH                         0x0000000c
+#define RENCODE_IB_PARAM_ENCODE_CONTEXT_BUFFER                 0x0000000d
+#define RENCODE_IB_PARAM_VIDEO_BITSTREAM_BUFFER                0x0000000e
+#define RENCODE_IB_PARAM_FEEDBACK_BUFFER                       0x00000010
+#define RENCODE_IB_PARAM_DIRECT_OUTPUT_NALU                    0x00000020
+
+#define RENCODE_HEVC_IB_PARAM_SLICE_CONTROL                    0x00100001
+#define RENCODE_HEVC_IB_PARAM_SPEC_MISC                        0x00100002
+#define RENCODE_HEVC_IB_PARAM_DEBLOCKING_FILTER                0x00100003
+
+#define RENCODE_H264_IB_PARAM_SLICE_CONTROL                    0x00200001
+#define RENCODE_H264_IB_PARAM_SPEC_MISC                        0x00200002
+#define RENCODE_H264_IB_PARAM_ENCODE_PARAMS                    0x00200003
+#define RENCODE_H264_IB_PARAM_DEBLOCKING_FILTER                0x00200004
+
 static void radeon_enc_session_info(struct radeon_encoder *enc)
 {
        unsigned int interface_version = ((RENCODE_FW_INTERFACE_MAJOR_VERSION << RENCODE_IF_MAJOR_VERSION_SHIFT) |