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

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

Merge "msm: cvp: Avoid racing in session deletion and use"

parents 7b6935a9 734e44be

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

+3 −0
Original line number Diff line number Diff line
@@ -758,6 +758,7 @@ static void aggregate_power_update(struct msm_cvp_core *core, 
	core->dyn_clk.sum_fps[HFI_HW_OD]  = 0;

	core->dyn_clk.sum_fps[HFI_HW_ICA] = 0;



	mutex_lock(&core->lock);

	list_for_each_entry(inst, &core->instances, list) {

		if (inst->state == MSM_CVP_CORE_INVALID ||

			inst->state == MSM_CVP_CORE_UNINIT ||
@@ -828,6 +829,8 @@ static void aggregate_power_update(struct msm_cvp_core *core, 
			core->dyn_clk.sum_fps[HFI_HW_ICA]);

	}



	mutex_unlock(&core->lock);



	for (i = 0; i < 2; i++) {

		fdu_sum[i] = max_3(fdu_sum[i], od_sum[i], mpu_sum[i]);

		fdu_sum[i] = max_3(fdu_sum[i], ica_sum[i], fw_sum[i]);