浏览代码

video: driver: Align hfi files to pick synx fence changes

Align hfi property and registers file with to pick synx fence
related interface changes

Change-Id: I19e5cce4d67f2f1eeacf917f9e688d2bb20f6585
Signed-off-by: Akshata Sahukar <[email protected]>
Akshata Sahukar 2 年之前
父节点
当前提交
2b974f7ad0
共有 2 个文件被更改,包括 22 次插入0 次删除
  1. 1 0
      driver/variant/iris33/src/msm_vidc_iris33.c
  2. 21 0
      driver/vidc/inc/hfi_property.h

+ 1 - 0
driver/variant/iris33/src/msm_vidc_iris33.c

@@ -44,6 +44,7 @@ typedef enum
     HFI_CTRL_READY                      = 0x1,
     HFI_CTRL_ERROR_FATAL                = 0x2,
     HFI_CTRL_ERROR_UC_REGION_NOT_SET    = 0x4,
+    HFI_CTRL_ERROR_HW_FENCE_QUEUE       = 0x8,
     HFI_CTRL_PC_READY                   = 0x100,
     HFI_CTRL_VCODEC_IDLE                = 0x40000000
 } hfi_ctrl_status_type;

+ 21 - 0
driver/vidc/inc/hfi_property.h

@@ -46,6 +46,8 @@ struct hfi_debug_header {
 };
 #define HFI_PROP_DEBUG_LOG_LEVEL                                0x0300000b
 
+#define HFI_PROP_FENCE_CLIENT_DATA                              0x0300000d
+
 enum hfi_codec_type {
     HFI_CODEC_DECODE_AVC   = 1,
     HFI_CODEC_ENCODE_AVC   = 2,
@@ -571,6 +573,23 @@ enum hfi_saliency_type {
 
 #define HFI_PROP_SLICE_DECODE                                   0x03000196
 
+/* u32 */
+enum hfi_fence_type {
+    HFI_SW_FENCE                      = 0x00000001,
+    HFI_SYNX_V2_FENCE                 = 0x00000002,
+};
+
+#define HFI_PROP_FENCE_TYPE                                     0x0300019D
+
+enum hfi_fence_direction_type {
+    HFI_FENCE_TX_ENABLE          = 0x00000001,
+    HFI_FENCE_RX_ENABLE          = 0x00000002,
+};
+
+#define HFI_PROP_FENCE_DIRECTION                                0x0300019E
+
+#define HFI_PROP_FENCE_ERROR_DATA_CORRUPT                       0x0300019F
+
 #define HFI_PROP_END                                            0x03FFFFFF
 
 #define HFI_SESSION_ERROR_BEGIN                                 0x04000000
@@ -617,6 +636,8 @@ enum hfi_saliency_type {
 
 #define HFI_INFO_HFI_FLAG_PSC_LAST                              0x06000007
 
+#define HFI_INFO_FENCE_SIGNAL_ERROR                             0x06000008
+
 #define HFI_INFORMATION_END                                     0x06FFFFFF
 
 #endif //__H_HFI_PROPERTY_H__