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

Commit 4d1260b0 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: schedule fw unload regardless of inst count"

parents 1e9eeed4 8f72a92e

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

+1 −1
Original line number Diff line number Diff line
@@ -2526,7 +2526,7 @@ static int msm_vidc_deinit_core(struct msm_vidc_inst *inst) 


	mutex_lock(&core->lock);



	if (!core->resources.never_unload_fw && list_empty(&core->instances)) {

	if (!core->resources.never_unload_fw) {

		cancel_delayed_work(&core->fw_unload_work);



		/*

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

+4 −3
Original line number Diff line number Diff line
@@ -2251,6 +2251,7 @@ static int venus_hfi_core_release(void *dev) 


	mutex_lock(&device->lock);



	if (device->res->pm_qos_latency_us)

		pm_qos_remove_request(&device->qos);

	__set_state(device, VENUS_STATE_DEINIT);

	__unload_fw(device);
@@ -4263,6 +4264,7 @@ static inline int __suspend(struct venus_hfi_device *device) 


	dprintk(VIDC_DBG, "Entering power collapse\n");



	if (device->res->pm_qos_latency_us)

		pm_qos_remove_request(&device->qos);



	rc = __tzbsp_set_video_state(TZBSP_VIDEO_STATE_SUSPEND);
@@ -4409,7 +4411,6 @@ static void __unload_fw(struct venus_hfi_device *device) 
	cancel_delayed_work(&venus_hfi_pm_work);

	if (device->state != VENUS_STATE_DEINIT)

		flush_workqueue(device->venus_pm_workq);

	__halt_axi(device);



	/*

	 * If the core_clk is asserted, then PIL cannot enable