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

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

Merge "msm: cvp: Avoid CVP loading at boot"

parents 17f11218 eeda4c6b

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

+5 −0
Original line number Diff line number Diff line
@@ -267,6 +267,11 @@ void *msm_cvp_open(int core_id, int session_type) 
		goto err_invalid_core;

	}



	if (!core->resources.auto_pil && session_type == MSM_CVP_BOOT) {

		dprintk(CVP_DBG, "Auto PIL disabled, bypass CVP init at boot");

		goto err_invalid_core;

	}



	core->resources.max_inst_count = MAX_SUPPORTED_INSTANCES;

	if (msm_cvp_check_for_inst_overload(core)) {

		dprintk(CVP_ERR, "Instance num reached Max, rejecting session");

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

+4 −0
Original line number Diff line number Diff line
@@ -98,6 +98,10 @@ static struct msm_cvp_common_data sm8250_common_data[] = { 
};



static struct msm_cvp_common_data sm8350_common_data[] = {

	{

		.key = "qcom,auto-pil",

		.value = 0,

	},

	{

		.key = "qcom,never-unload-fw",

		.value = 1,

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

+3 −0
Original line number Diff line number Diff line
@@ -693,6 +693,9 @@ int cvp_read_platform_resources_from_drv_data( 


	dprintk(CVP_DBG, "Firmware filename: %s\n", res->fw_name);



	res->auto_pil = find_key_value(platform_data,

			"qcom,aut-pil");



	res->max_load = find_key_value(platform_data,

			"qcom,max-hw-load");

drivers/media/platform/msm/cvp/msm_cvp_resources.h

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ struct msm_cvp_platform_resources { 
	struct reset_set reset_set;

	bool use_non_secure_pil;

	bool sw_power_collapsible;

	bool auto_pil;

	struct list_head context_banks;

	bool thermal_mitigable;

	const char *fw_name;