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

Commit 33f45094 authored by Abdulla Anam's avatar Abdulla Anam Committed by Shivendra Kakrania
Browse files

msm: vidc: Prioritize debugfs timeout control over dtsi entry 



Debugfs timeout control is read only during probe, which makes
it useless as control to allow/disallow crash during sys error
Prioritize this control over the dtsi entry.

Change-Id: I3925653948b81e44d6540c28aa98881418e29f6e
Signed-off-by: default avatarAbdulla Anam <abdullahanam@codeaurora.org>
Signed-off-by: default avatarShivendra Kakrania <shiven@codeaurora.org>
parent 8468ee81

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

+1 −2
Original line number Diff line number Diff line
@@ -4167,7 +4167,6 @@ int msm_comm_try_get_prop(struct msm_vidc_inst *inst, enum hal_property ptype, 
		call_hfi_op(hdev, flush_debug_queue, hdev->hfi_device_data);

		dprintk(VIDC_ERR,

			"SESS_PROP timeout can potentially crash the system\n");

		if (inst->core->resources.debug_timeout)

		msm_comm_print_debug_info(inst);



		msm_vidc_handle_hw_error(inst->core);

drivers/media/platform/msm/vidc/msm_vidc_debug.h

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static inline void msm_vidc_handle_hw_error(struct msm_vidc_core *core) 
{

	bool enable_fatal;



	enable_fatal = core->resources.debug_timeout;

	enable_fatal = msm_vidc_debug_timeout;



	/* Video driver can decide FATAL handling of HW errors

	 * based on multiple factors. This condition check will

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

+1 −1
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ int read_platform_resources_from_dt( 
	res->debug_timeout = of_property_read_bool(pdev->dev.of_node,

			"qcom,debug-timeout");



	res->debug_timeout |= msm_vidc_debug_timeout;

	msm_vidc_debug_timeout |= res->debug_timeout;



	of_property_read_u32(pdev->dev.of_node,

			"qcom,pm-qos-latency-us", &res->pm_qos_latency_us);