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

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

Merge "msm: vidc: remove structure vidc_hal_session_init_done"

parents 345a8950 8a68da65

msm/vidc/hfi_response_handler.c

+2 −7
Original line number Diff line number Diff line
@@ -109,8 +109,7 @@ static int hfi_process_sess_evt_seq_changed(u32 device_id, 
	struct hfi_colour_space *colour_info;



	if (sizeof(struct hfi_msg_event_notify_packet) > pkt->size) {

		dprintk(VIDC_ERR,

				"hal_process_session_init_done: bad_pkt_size\n");

		dprintk(VIDC_ERR, "%s: bad_pkt_size\n", __func__);

		return -E2BIG;

	}
@@ -285,8 +284,7 @@ static int hfi_process_evt_release_buffer_ref(u32 device_id, 
			"RECEIVED: EVENT_NOTIFY - release_buffer_reference\n");

	if (sizeof(struct hfi_msg_event_notify_packet)

		> pkt->size) {

		dprintk(VIDC_ERR,

				"hal_process_session_init_done: bad_pkt_size\n");

		dprintk(VIDC_ERR, "%s: bad_pkt_size\n", __func__);

		return -E2BIG;

	}
@@ -618,7 +616,6 @@ static int hfi_process_session_init_done(u32 device_id, 
{

	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} };



	dprintk(VIDC_DBG, "RECEIVED: SESSION_INIT_DONE[%x]\n", pkt->session_id);
@@ -631,8 +628,6 @@ static int hfi_process_session_init_done(u32 device_id, 
	cmd_done.device_id = device_id;

	cmd_done.session_id = (void *)(uintptr_t)pkt->session_id;

	cmd_done.status = hfi_map_err_status(pkt->error_type);

	cmd_done.data.session_init_done = session_init_done;

	cmd_done.size = sizeof(struct vidc_hal_session_init_done);



	info->response_type = HAL_SESSION_INIT_DONE;

	info->response.cmd = cmd_done;

msm/vidc/vidc_hfi_api.h

+0 −5
Original line number Diff line number Diff line
@@ -574,10 +574,6 @@ struct vidc_hal_sys_init_done { 
	u32 max_sessions_supported;

};



struct vidc_hal_session_init_done {

	struct msm_vidc_capability capability;

};



struct msm_vidc_cb_cmd_done {

	u32 device_id;

	void *session_id;
@@ -592,7 +588,6 @@ struct msm_vidc_cb_cmd_done { 
		struct vidc_hal_ebd ebd;

		struct vidc_hal_fbd fbd;

		struct vidc_hal_sys_init_done sys_init_done;

		struct vidc_hal_session_init_done session_init_done;

		struct hal_buffer_info buffer_info;

		struct vidc_register_buffer regbuf;

		struct vidc_unregister_buffer unregbuf;