Procházet zdrojové kódy

msm: eva: Move cvp_buf_type to UAPI

Ensure consistent buffer type use between UMD and KMD.

Change-Id: I77d619420d584e3c29babc8ddc5e80232f901009
Signed-off-by: George Shen <[email protected]>
George Shen před 2 roky
rodič
revize
f2e6be65e4
2 změnil soubory, kde provedl 27 přidání a 28 odebrání
  1. 27 0
      include/uapi/eva/media/msm_eva_private.h
  2. 0 28
      msm/eva/msm_cvp_buf.h

+ 27 - 0
include/uapi/eva/media/msm_eva_private.h

@@ -119,6 +119,33 @@ struct eva_kmd_client_data {
 	__u32 client_data1;
 	__u32 client_data2;
 };
+#ifdef CVP_CONFIG_SYNX_V2
+struct cvp_buf_type {
+	__s32 fd;
+	__u32 size;
+	__u32 offset;
+	__u32 flags;
+	__u32 reserved1;
+	__u32 reserved2;
+	__u32 fence_type;
+	__u32 input_handle;
+	__u32 output_handle;
+};
+#else
+struct cvp_buf_type {
+	__s32 fd;
+	__u32 size;
+	__u32 offset;
+	__u32 flags;
+	union {
+		struct dma_buf *dbuf;
+		struct {
+			__u32 reserved1;
+			__u32 reserved2;
+		};
+	};
+};
+#endif
 
 /**
  * Structures and macros for Out-of-Band (OOB) buffer

+ 0 - 28
msm/eva/msm_cvp_buf.h

@@ -112,34 +112,6 @@ static inline void DEINIT_DMAMAP_CACHE(struct cvp_dmamap_cache *cache)
 #define INPUT_FENCE_BITMASK 0x1
 #define OUTPUT_FENCE_BITMASK 0x2
 
-#ifdef CVP_CONFIG_SYNX_V2
-struct cvp_buf_type {
-	s32 fd;
-	u32 size;
-	u32 offset;
-	u32 flags;
-	u32 reserved1;
-	u32 reserved2;
-	u32 fence_type;
-	u32 input_handle;
-	u32 output_handle;
-};
-#else
-struct cvp_buf_type {
-	s32 fd;
-	u32 size;
-	u32 offset;
-	u32 flags;
-	union {
-		struct dma_buf *dbuf;
-		struct {
-			u32 reserved1;
-			u32 reserved2;
-		};
-	};
-};
-#endif
-
 enum buffer_owner {
 	DRIVER,
 	FIRMWARE,