Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe7ca129 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: cvp: Update configuration for Pyramid feature"

parents 3a82b7c0 2e73c5db

drivers/media/platform/msm/cvp/cvp_hfi.h

+2 −2
Original line number Diff line number Diff line
@@ -319,9 +319,9 @@ 


#define  HFI_CMD_SESSION_CVP_SET_PERSIST_BUFFERS\

	(HFI_CMD_SESSION_CVP_START + 0x04D)

#define HFI_CMD_SESSION_CVP_PYS_HCD_FRAME\

	(HFI_CMD_SESSION_CVP_START + 0x050)

#define HFI_CMD_SESSION_CVP_PYS_HCD_CONFIG\

	(HFI_CMD_SESSION_CVP_START + 0x050)

#define HFI_CMD_SESSION_CVP_PYS_HCD_FRAME\

	(HFI_CMD_SESSION_CVP_START + 0x051)

#define  HFI_CMD_SESSION_CVP_ICA_FRAME\

	(HFI_CMD_SESSION_CVP_START + 0x100)

drivers/media/platform/msm/cvp/cvp_hfi_api.h

+4 −4
Original line number Diff line number Diff line
@@ -111,10 +111,10 @@ 
#define HFI_DCM_BUFFERS_OFFSET 9

#define HFI_DCM_BUF_NUM 5



#define HFI_PYS_HCD_CONFIG_CMD_SIZE 661

#define HFI_PYS_HCD_FRAME_CMD_SIZE 86

#define HFI_PYS_HCD_BUFFERS_OFFSET 6

#define HFI_PYS_HCD_BUF_NUM 36

#define HFI_PYS_HCD_CONFIG_CMD_SIZE 461

#define HFI_PYS_HCD_FRAME_CMD_SIZE 66

#define HFI_PYS_HCD_BUFFERS_OFFSET 14

#define HFI_PYS_HCD_BUF_NUM 26



enum cvp_status {

	CVP_ERR_NONE = 0x0,

include/uapi/media/msm_cvp_private.h

+14 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ struct cvp_kmd_client_data { 


#define CVP_PERSIST_CMD_SIZE 11

#define CVP_PERSIST_BUFFERS_OFFSET 7

#define CVP_PSRSIST_BUF_NUM	2

#define CVP_PERSIST_BUF_NUM	2



struct cvp_kmd_dfs_config {

	unsigned int cvp_dfs_config[CVP_DFS_CONFIG_CMD_SIZE];
@@ -207,7 +207,7 @@ struct cvp_kmd_persist_buf { 
	unsigned int persist_data[CVP_PERSIST_CMD_SIZE];

};



#define	MAX_HFI_PKT_SIZE	250

#define	MAX_HFI_PKT_SIZE	470



struct cvp_kmd_hfi_packet {

	unsigned int pkt_data[MAX_HFI_PKT_SIZE];
@@ -223,6 +223,17 @@ struct cvp_kmd_sys_properties { 
	struct cvp_kmd_sys_property prop_data;

};



#define SESSION_CREATE	1

#define SESSION_DELETE	2

#define SESSION_START	3

#define SESSION_STOP	4

#define SESSION_INFO	5



struct cvp_kmd_session_control {

	unsigned int ctrl_type;

	unsigned int ctrl_data[8];

};



#define MAX_HFI_FENCE_SIZE        16

#define	MAX_HFI_FENCE_OFFSET	(MAX_HFI_PKT_SIZE-MAX_HFI_FENCE_SIZE)

struct cvp_kmd_hfi_fence_packet {
@@ -266,6 +277,7 @@ struct cvp_kmd_arg { 
		struct cvp_kmd_hfi_packet hfi_pkt;

		struct cvp_kmd_sys_properties sys_properties;

		struct cvp_kmd_hfi_fence_packet hfi_fence_pkt;

		struct cvp_kmd_session_control session_ctrl;

	} data;

};

#endif