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

Commit 1ae9d165 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Enhance debug message for control" into msm-4.9

parents aeca962e 92fc3b04

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

+2 −0
Original line number Diff line number Diff line
@@ -920,6 +920,8 @@ int create_pkt_cmd_session_set_property( 
	pkt->session_id = hash32_ptr(session);

	pkt->num_properties = 1;



	dprintk(VIDC_DBG, "Setting HAL Property = 0x%x\n", ptype);



	switch (ptype) {

	case HAL_CONFIG_FRAME_RATE:

	{

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

+2 −2
Original line number Diff line number Diff line
@@ -964,8 +964,8 @@ int msm_vdec_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 


	if (!rc && property_id) {

		dprintk(VIDC_DBG,

			"Control: HAL property=%#x,ctrl: id=%#x,value=%#x\n",

			property_id, ctrl->id, ctrl->val);

			"Control: Name = %s, ID = 0x%x Value = %d\n",

				ctrl->name, ctrl->id, ctrl->val);

		rc = call_hfi_op(hdev, session_set_property, (void *)

				inst->session, property_id, pdata);

	}

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

+3 −3
Original line number Diff line number Diff line
@@ -1855,9 +1855,9 @@ int msm_venc_s_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
#undef TRY_GET_CTRL



	if (!rc && property_id) {

		dprintk(VIDC_DBG, "Control: HAL property=%x,ctrl_value=%d\n",

				property_id,

				ctrl->val);

		dprintk(VIDC_DBG,

			"Control: Name = %s, ID = 0x%x Value = %d\n",

				ctrl->name, ctrl->id, ctrl->val);

		rc = call_hfi_op(hdev, session_set_property,

				(void *)inst->session, property_id, pdata);

	}