Merge "msm: vidc: fix KCFI errors" (2fbffcea) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/media/platform/msm/vidc/hfi_response_handler.c

+39 −20

Original line number	Diff line number	Diff line
		@@ -358,9 +358,10 @@ static int hfi_process_session_error(u32 device_id,
		}

		static int hfi_process_event_notify(u32 device_id,
		struct hfi_msg_event_notify_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_event_notify_packet *pkt = _pkt;
		dprintk(VIDC_DBG, "Received: EVENT_NOTIFY\n");

		if (pkt->size < sizeof(struct hfi_msg_event_notify_packet)) {
		@@ -399,9 +400,10 @@ static int hfi_process_event_notify(u32 device_id,
		}

		static int hfi_process_sys_init_done(u32 device_id,
		struct hfi_msg_sys_init_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_sys_init_done_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};
		enum vidc_status status = VIDC_ERR_NONE;

		@@ -438,9 +440,10 @@ static int hfi_process_sys_init_done(u32 device_id,
		}

		static int hfi_process_sys_rel_resource_done(u32 device_id,
		struct hfi_msg_sys_release_resource_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_sys_release_resource_done_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};
		enum vidc_status status = VIDC_ERR_NONE;
		u32 pkt_size;
		@@ -1229,9 +1232,10 @@ static void hfi_process_sess_get_prop_buf_req(
		}

		static int hfi_process_session_prop_info(u32 device_id,
		struct hfi_msg_session_property_info_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_session_property_info_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};
		struct buffer_requirements buff_req = { { {0} } };

		@@ -1270,9 +1274,10 @@ static int hfi_process_session_prop_info(u32 device_id,
		}

		static int hfi_process_session_init_done(u32 device_id,
		struct hfi_msg_sys_session_init_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_sys_session_init_done_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};
		struct vidc_hal_session_init_done session_init_done = { {0} };

		@@ -1297,9 +1302,10 @@ static int hfi_process_session_init_done(u32 device_id,
		}

		static int hfi_process_session_load_res_done(u32 device_id,
		struct hfi_msg_session_load_resources_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_session_load_resources_done_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};

		dprintk(VIDC_DBG, "RECEIVED: SESSION_LOAD_RESOURCES_DONE[%#x]\n",
		@@ -1325,9 +1331,10 @@ static int hfi_process_session_load_res_done(u32 device_id,
		}

		static int hfi_process_session_flush_done(u32 device_id,
		struct hfi_msg_session_flush_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_session_flush_done_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};

		dprintk(VIDC_DBG, "RECEIVED: SESSION_FLUSH_DONE[%#x]\n",
		@@ -1368,9 +1375,10 @@ static int hfi_process_session_flush_done(u32 device_id,
		}

		static int hfi_process_session_etb_done(u32 device_id,
		struct hfi_msg_session_empty_buffer_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_session_empty_buffer_done_packet *pkt = _pkt;
		struct msm_vidc_cb_data_done data_done = {0};
		struct hfi_picture_type *hfi_picture_type = NULL;

		@@ -1422,9 +1430,10 @@ static int hfi_process_session_etb_done(u32 device_id,
		}

		static int hfi_process_session_ftb_done(
		u32 device_id, struct vidc_hal_msg_pkt_hdr *msg_hdr,
		u32 device_id, void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct vidc_hal_msg_pkt_hdr *msg_hdr = _pkt;
		struct msm_vidc_cb_data_done data_done = {0};
		bool is_decoder = false, is_encoder = false;

		@@ -1546,9 +1555,10 @@ static int hfi_process_session_ftb_done(
		}

		static int hfi_process_session_start_done(u32 device_id,
		struct hfi_msg_session_start_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_session_start_done_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};

		dprintk(VIDC_DBG, "RECEIVED: SESSION_START_DONE[%#x]\n",
		@@ -1572,9 +1582,10 @@ static int hfi_process_session_start_done(u32 device_id,
		}

		static int hfi_process_session_stop_done(u32 device_id,
		struct hfi_msg_session_stop_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_session_stop_done_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};

		dprintk(VIDC_DBG, "RECEIVED: SESSION_STOP_DONE[%#x]\n",
		@@ -1599,9 +1610,10 @@ static int hfi_process_session_stop_done(u32 device_id,
		}

		static int hfi_process_session_rel_res_done(u32 device_id,
		struct hfi_msg_session_release_resources_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_session_release_resources_done_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};

		dprintk(VIDC_DBG, "RECEIVED: SESSION_RELEASE_RESOURCES_DONE[%#x]\n",
		@@ -1626,9 +1638,10 @@ static int hfi_process_session_rel_res_done(u32 device_id,
		}

		static int hfi_process_session_rel_buf_done(u32 device_id,
		struct hfi_msg_session_release_buffers_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_session_release_buffers_done_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};

		if (!pkt \|\| pkt->size <
		@@ -1655,9 +1668,10 @@ static int hfi_process_session_rel_buf_done(u32 device_id,
		}

		static int hfi_process_session_register_buffer_done(u32 device_id,
		struct hfi_msg_session_register_buffers_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_session_register_buffers_done_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};

		if (!pkt \|\| pkt->size <
		@@ -1682,9 +1696,10 @@ static int hfi_process_session_register_buffer_done(u32 device_id,
		}

		static int hfi_process_session_unregister_buffer_done(u32 device_id,
		struct hfi_msg_session_unregister_buffers_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_session_unregister_buffers_done_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};

		if (!pkt \|\| pkt->size <
		@@ -1709,9 +1724,10 @@ static int hfi_process_session_unregister_buffer_done(u32 device_id,
		}

		static int hfi_process_session_end_done(u32 device_id,
		struct hfi_msg_sys_session_end_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_sys_session_end_done_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};

		dprintk(VIDC_DBG, "RECEIVED: SESSION_END_DONE[%#x]\n", pkt->session_id);
		@@ -1734,9 +1750,10 @@ static int hfi_process_session_end_done(u32 device_id,
		}

		static int hfi_process_session_abort_done(u32 device_id,
		struct hfi_msg_sys_session_abort_done_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_sys_session_abort_done_packet *pkt = _pkt;
		struct msm_vidc_cb_cmd_done cmd_done = {0};

		dprintk(VIDC_DBG, "RECEIVED: SESSION_ABORT_DONE[%#x]\n",
		@@ -1802,9 +1819,10 @@ static void hfi_process_sys_get_prop_image_version(
		}

		static int hfi_process_sys_property_info(u32 device_id,
		struct hfi_msg_sys_property_info_packet *pkt,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		struct hfi_msg_sys_property_info_packet *pkt = _pkt;
		if (!pkt) {
		dprintk(VIDC_ERR, "%s: invalid param\n", __func__);
		return -EINVAL;
		@@ -1836,7 +1854,7 @@ static int hfi_process_sys_property_info(u32 device_id,
		}

		static int hfi_process_ignore(u32 device_id,
		struct vidc_hal_msg_pkt_hdr *msg_hdr,
		void *_pkt,
		struct msm_vidc_cb_info *info)
		{
		*info = (struct msm_vidc_cb_info) {
		@@ -1925,5 +1943,6 @@ int hfi_process_msg_packet(u32 device_id, struct vidc_hal_msg_pkt_hdr *msg_hdr,
		break;
		}

		return pkt_func ? pkt_func(device_id, msg_hdr, info) : -ENOTSUPP;
		return pkt_func ?
		pkt_func(device_id, (void *)msg_hdr, info) : -ENOTSUPP;
		}