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

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

Merge "msm: cvp: Re-classification of traces for CVP_DBG"

parents fc6304ea a24a9ce1

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

+4 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int cvp_open(struct inode *inode, struct file *filp) 
		struct msm_cvp_core, cdev);

	struct msm_cvp_inst *inst;



	dprintk(CVP_DBG, "%s: Enter\n", __func__);

	dprintk(CVP_SESS, "%s: Enter\n", __func__);



	inst = msm_cvp_open(core->id, MSM_CVP_USER);

	if (!inst) {
@@ -209,7 +209,7 @@ static ssize_t thermal_level_store(struct device *dev, 
			"Invalid thermal level value: %s\n", buf);

		return -EINVAL;

	}

	dprintk(CVP_DBG, "Thermal level old %d new %d\n",

	dprintk(CVP_PWR, "Thermal level old %d new %d\n",

			cvp_driver->thermal_level, val);



	if (val == cvp_driver->thermal_level)
@@ -375,7 +375,7 @@ static int msm_probe_cvp_device(struct platform_device *pdev) 
		if (rc != -EPROBE_DEFER)

			dprintk(CVP_ERR, "Failed to create HFI device\n");

		else

			dprintk(CVP_DBG, "msm_cvp: request probe defer\n");

			dprintk(CVP_CORE, "msm_cvp: request probe defer\n");

		goto err_hfi_initialize;

	}
@@ -388,7 +388,7 @@ static int msm_probe_cvp_device(struct platform_device *pdev) 


	cvp_driver->sku_version = core->resources.sku_version;



	dprintk(CVP_DBG, "populating sub devices\n");

	dprintk(CVP_CORE, "populating sub devices\n");

	/*

	 * Trigger probe for each sub-device i.e. qcom,msm-cvp,context-bank.

	 * When msm_cvp_probe is called for each sub-device, parse the

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

+72 −72

File changed.

Preview size limit exceeded, changes collapsed.

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

+5 −5
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ int cvp_create_pkt_cmd_sys_coverage_config( 
	pkt->num_properties = 1;

	pkt->rg_property_data[0] = HFI_PROPERTY_SYS_CONFIG_COVERAGE;

	pkt->rg_property_data[1] = mode;

	dprintk(CVP_DBG, "Firmware coverage mode %d\n",

	dprintk(CVP_PKT, "Firmware coverage mode %d\n",

			pkt->rg_property_data[1]);

	return 0;

}
@@ -99,7 +99,7 @@ int cvp_create_pkt_cmd_sys_set_idle_indicator( 
	pkt->num_properties = 1;

	pkt->rg_property_data[0] = HFI_PROPERTY_SYS_IDLE_INDICATOR;

	pkt->rg_property_data[1] = mode;

	dprintk(CVP_DBG, "Firmware idle indicator mode %d\n",

	dprintk(CVP_PKT, "Firmware idle indicator mode %d\n",

			pkt->rg_property_data[1]);

	return 0;

}
@@ -148,7 +148,7 @@ int cvp_create_pkt_cmd_sys_set_resource( 


		for (i = 0; i < hfi_sc_info->num_entries; i++) {

			hfi_sc[i] = res_sc[i];

		dprintk(CVP_DBG, "entry hfi#%d, sc_id %d, size %d\n",

		dprintk(CVP_PKT, "entry hfi#%d, sc_id %d, size %d\n",

				 i, hfi_sc[i].sc_id, hfi_sc[i].size);

		}

		break;
@@ -189,7 +189,7 @@ int cvp_create_pkt_cmd_sys_release_resource( 
		rc = -ENOTSUPP;

	}



	dprintk(CVP_DBG,

	dprintk(CVP_PKT,

		"rel_res: pkt_type 0x%x res_type 0x%x prepared\n",

		pkt->packet_type, pkt->resource_type);
@@ -449,7 +449,7 @@ static struct cvp_hfi_packetization_ops hfi_default = { 
struct cvp_hfi_packetization_ops *cvp_hfi_get_pkt_ops_handle(

			enum hfi_packetization_type type)

{

	dprintk(CVP_DBG, "%s selected\n",

	dprintk(CVP_HFI, "%s selected\n",

		type == HFI_PACKETIZATION_4XX ?

		"4xx packetization" : "Unknown hfi");

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

+16 −16
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int hfi_process_event_notify(u32 device_id, 
	struct cvp_hfi_msg_event_notify_packet *pkt =

			(struct cvp_hfi_msg_event_notify_packet *)hdr;



	dprintk(CVP_DBG, "Received: EVENT_NOTIFY\n");

	dprintk(CVP_HFI, "Received: EVENT_NOTIFY\n");



	if (pkt->size < sizeof(struct cvp_hfi_msg_event_notify_packet)) {

		dprintk(CVP_ERR, "Invalid Params\n");
@@ -156,14 +156,14 @@ static int hfi_process_sys_init_done(u32 device_id, 
	struct msm_cvp_cb_cmd_done cmd_done = {0};

	enum cvp_status status = CVP_ERR_NONE;



	dprintk(CVP_DBG, "RECEIVED: SYS_INIT_DONE\n");

	dprintk(CVP_CORE, "RECEIVED: SYS_INIT_DONE\n");

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

		dprintk(CVP_ERR, "%s: bad_pkt_size: %d\n", __func__,

				pkt->size);

		return -E2BIG;

	}

	if (!pkt->num_properties) {

		dprintk(CVP_DBG,

		dprintk(CVP_CORE,

				"hal_process_sys_init_done: no_properties\n");

		goto err_no_prop;

	}
@@ -218,7 +218,7 @@ enum cvp_status cvp_hfi_process_sys_init_done_prop_read( 


	data_ptr = (u8 *) &pkt->rg_property_data[0];

	num_properties = pkt->num_properties;

	dprintk(CVP_DBG,

	dprintk(CVP_HFI,

		"%s: data_start %pK, num_properties %#x\n",

		__func__, data_ptr, num_properties);
@@ -234,7 +234,7 @@ static int hfi_process_session_init_done(u32 device_id, 
	struct msm_cvp_cb_cmd_done cmd_done = {0};

	struct cvp_hal_session_init_done session_init_done = { {0} };



	dprintk(CVP_DBG, "RECEIVED: SESSION_INIT_DONE[%x]\n", pkt->session_id);

	dprintk(CVP_SESS, "RECEIVED: SESSION_INIT_DONE[%x]\n", pkt->session_id);



	if (sizeof(struct cvp_hfi_msg_sys_session_init_done_packet)

			> pkt->size) {
@@ -261,7 +261,7 @@ static int hfi_process_session_end_done(u32 device_id, 
			(struct cvp_hfi_msg_sys_session_end_done_packet *)hdr;

	struct msm_cvp_cb_cmd_done cmd_done = {0};



	dprintk(CVP_DBG, "RECEIVED: SESSION_END_DONE[%#x]\n", pkt->session_id);

	dprintk(CVP_SESS, "RECEIVED: SESSION_END_DONE[%#x]\n", pkt->session_id);



	if (!pkt || pkt->size !=

		sizeof(struct cvp_hfi_msg_sys_session_end_done_packet)) {
@@ -287,7 +287,7 @@ static int hfi_process_session_abort_done(u32 device_id, 
		(struct cvp_hfi_msg_sys_session_abort_done_packet *)hdr;

	struct msm_cvp_cb_cmd_done cmd_done = {0};



	dprintk(CVP_DBG, "RECEIVED: SESSION_ABORT_DONE[%#x]\n",

	dprintk(CVP_SESS, "RECEIVED: SESSION_ABORT_DONE[%#x]\n",

			pkt->session_id);



	if (!pkt || pkt->size !=
@@ -320,7 +320,7 @@ static int hfi_process_session_set_buf_done(u32 device_id, 
				pkt ? pkt->size : 0);

		return -E2BIG;

	}

	dprintk(CVP_DBG, "RECEIVED:CVP_SET_BUFFER_DONE[%#x]\n",

	dprintk(CVP_SESS, "RECEIVED:CVP_SET_BUFFER_DONE[%#x]\n",

			pkt->session_id);



	cmd_done.device_id = device_id;
@@ -341,7 +341,7 @@ static int hfi_process_session_flush_done(u32 device_id, 
		(struct cvp_hfi_msg_sys_session_flush_done_packet *)hdr;

	struct msm_cvp_cb_cmd_done cmd_done = {0};



	dprintk(CVP_DBG, "RECEIVED: SESSION_FLUSH_DONE[%#x]\n",

	dprintk(CVP_SESS, "RECEIVED: SESSION_FLUSH_DONE[%#x]\n",

			pkt->session_id);



	if (!pkt || pkt->size <
@@ -374,7 +374,7 @@ static int hfi_process_session_rel_buf_done(u32 device_id, 
				pkt ? pkt->size : 0);

		return -E2BIG;

	}

	dprintk(CVP_DBG, "RECEIVED:CVP_RELEASE_BUFFER_DONE[%#x]\n",

	dprintk(CVP_SESS, "RECEIVED:CVP_RELEASE_BUFFER_DONE[%#x]\n",

			pkt->session_id);



	cmd_done.device_id = device_id;
@@ -412,7 +412,7 @@ static int hfi_process_session_cvp_operation_config(u32 device_id, 
	cmd_done.status = hfi_map_err_status(error_type);

	cmd_done.size = 0;



	dprintk(CVP_DBG,

	dprintk(CVP_HFI,

		"%s: device_id=%d status=%d, sessionid=%pK config=%x\n",

		__func__, device_id, cmd_done.status,

		cmd_done.session_id, pkt->op_conf_id);
@@ -516,7 +516,7 @@ static int hfi_process_session_cvp_msg(u32 device_id, 


	memcpy(&sess_msg->pkt, pkt, get_msg_size());



	dprintk(CVP_DBG,

	dprintk(CVP_HFI,

		"%s: Received msg %x cmd_done.status=%d sessionid=%x\n",

		__func__, pkt->packet_type,

		hfi_map_err_status(get_msg_errorcode(pkt)), session_id);
@@ -570,7 +570,7 @@ static void hfi_process_sys_get_prop_image_version( 
			cvp_driver->fw_version[i] = ' ';

	}

	cvp_driver->fw_version[i] = '\0';

	dprintk(CVP_DBG, "F/W version: %s\n", cvp_driver->fw_version);

	dprintk(CVP_HFI, "F/W version: %s\n", cvp_driver->fw_version);

}



static int hfi_process_sys_property_info(u32 device_id,
@@ -600,7 +600,7 @@ static int hfi_process_sys_property_info(u32 device_id, 
		};

		return 0;

	default:

		dprintk(CVP_DBG,

		dprintk(CVP_WARN,

				"%s: unknown_prop_id: %x\n",

				__func__, pkt->rg_property_data[0]);

		return -ENOTSUPP;
@@ -621,7 +621,7 @@ int cvp_hfi_process_msg_packet(u32 device_id, void *hdr, 
		return -EINVAL;

	}



	dprintk(CVP_DBG, "Received HFI MSG with type %#x\n", msg_hdr->packet);

	dprintk(CVP_HFI, "Received HFI MSG with type %#x\n", msg_hdr->packet);

	switch (msg_hdr->packet) {

	case HFI_MSG_EVENT_NOTIFY:

		pkt_func = (pkt_func_def)hfi_process_event_notify;
@@ -664,7 +664,7 @@ int cvp_hfi_process_msg_packet(u32 device_id, void *hdr, 
		pkt_func = (pkt_func_def)hfi_process_session_cvp_msg;

		break;

	default:

		dprintk(CVP_DBG, "Use default msg handler: %#x\n",

		dprintk(CVP_HFI, "Use default msg handler: %#x\n",

				msg_hdr->packet);

		pkt_func = (pkt_func_def)hfi_process_session_cvp_msg;

		break;

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

+33 −33

File changed.

Preview size limit exceeded, changes collapsed.