Merge "msm: cvp: Add DCM command support" (dc8ae713) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+15 −0

Original line number	Diff line number	Diff line
		@@ -171,6 +171,20 @@ const struct msm_cvp_hfi_defs cvp_hfi_defs[] = {
		.buf_num = HFI_HCD_BUF_NUM,
		.resp = HAL_NO_RESP,
		},
		{
		.size = HFI_DCM_CONFIG_CMD_SIZE,
		.type = HFI_CMD_SESSION_CVP_DC_CONFIG,
		.buf_offset = 0,
		.buf_num = 0,
		.resp = HAL_SESSION_DC_CONFIG_CMD_DONE,
		},
		{
		.size = HFI_DCM_FRAME_CMD_SIZE,
		.type = HFI_CMD_SESSION_CVP_DC_FRAME,
		.buf_offset = HFI_DCM_BUFFERS_OFFSET,
		.buf_num = HFI_DCM_BUF_NUM,
		.resp = HAL_NO_RESP,
		},
		{
		.size = HFI_DCM_CONFIG_CMD_SIZE,
		.type = HFI_CMD_SESSION_CVP_DCM_CONFIG,
		@@ -3038,6 +3052,7 @@ static void *get_session_id(struct msm_cvp_cb_info info)
		case HAL_SESSION_ICA_CONFIG_CMD_DONE:
		case HAL_SESSION_HCD_CONFIG_CMD_DONE:
		case HAL_SESSION_DCM_CONFIG_CMD_DONE:
		case HAL_SESSION_DC_CONFIG_CMD_DONE:
		case HAL_SESSION_PYS_HCD_CONFIG_CMD_DONE:
		case HAL_SESSION_DME_BASIC_CONFIG_CMD_DONE:
		case HAL_SESSION_DFS_FRAME_CMD_DONE:

+4 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,10 @@
		(HFI_CMD_SESSION_CVP_START + 0x014)

		/* ===========USECASE OPERATIONS===============*/
		#define HFI_CMD_SESSION_CVP_DC_FRAME\
		(HFI_CMD_SESSION_CVP_START + 0x030)
		#define HFI_CMD_SESSION_CVP_DC_CONFIG\
		(HFI_CMD_SESSION_CVP_START + 0x031)
		#define HFI_CMD_SESSION_CVP_DCM_FRAME\
		(HFI_CMD_SESSION_CVP_START + 0x034)
		#define HFI_CMD_SESSION_CVP_DCM_CONFIG\

+1 −0

Original line number	Diff line number	Diff line
		@@ -1180,6 +1180,7 @@ enum hal_command_response {
		HAL_SESSION_NCC_CONFIG_CMD_DONE,
		HAL_SESSION_ICA_CONFIG_CMD_DONE,
		HAL_SESSION_HCD_CONFIG_CMD_DONE,
		HAL_SESSION_DC_CONFIG_CMD_DONE,
		HAL_SESSION_DCM_CONFIG_CMD_DONE,
		HAL_SESSION_PYS_HCD_CONFIG_CMD_DONE,
		HAL_SESSION_PERSIST_CMD_DONE,

+1 −0

Original line number	Diff line number	Diff line
		@@ -813,6 +813,7 @@ void cvp_handle_cmd_response(enum hal_command_response cmd, void *data)
		case HAL_SESSION_ICA_CONFIG_CMD_DONE:
		case HAL_SESSION_HCD_CONFIG_CMD_DONE:
		case HAL_SESSION_DCM_CONFIG_CMD_DONE:
		case HAL_SESSION_DC_CONFIG_CMD_DONE:
		case HAL_SESSION_PYS_HCD_CONFIG_CMD_DONE:
		cvp_handle_session_cmd_done(cmd, data);
		break;