samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

waipio: driver: Add support for fw unload and power collapse

Browse Source 
If required, Firmware can be unloaded after every session.
Power collapse is enabled by default.

Change-Id: Ie014a26ae600816d8713cd34826f1f9a77088e4a
Signed-off-by: Chinmay Sawarkar <chinmays@codeaurora.org>
This commit is contained in:
Chinmay Sawarkar
2021-01-13 17:45:43 -08:00
parent 0a2003b005
commit 852608fcc3
5 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
driver/vidc/src/msm_vidc.c
View File

@@ -817,11 +817,15 @@ int msm_vidc_close(void *instance)
{
int rc = 0;
struct msm_vidc_inst *inst = instance;
struct msm_vidc_core *core;
if (!inst) {
d_vpr_e("%s: invalid params\n", __func__);
return -EINVAL;
}
core = inst->core;
s_vpr_h(inst->sid, "%s()\n", __func__);
mutex_lock(&inst->lock);
msm_vidc_session_close(inst);
@@ -829,6 +833,8 @@ int msm_vidc_close(void *instance)
msm_vidc_destroy_buffers(inst);
mutex_unlock(&inst->lock);
put_inst(inst);
msm_vidc_schedule_core_deinit(core);
return rc;
}
EXPORT_SYMBOL(msm_vidc_close);

47
driver/vidc/src/msm_vidc_driver.c
View File

@@ -442,11 +442,6 @@ int msm_vidc_change_core_state(struct msm_vidc_core *core,
return -EINVAL;
}
if (!request_state) {
d_vpr_e("%s: invalid core request state\n", func);
return -EINVAL;
}
d_vpr_h("%s: core state changed from %s to %s\n",
func, core_state_name(core->state),
core_state_name(request_state));
@@ -2457,7 +2452,7 @@ error:
return rc;
}
int msm_vidc_core_deinit(struct msm_vidc_core *core)
int msm_vidc_core_deinit(struct msm_vidc_core *core, bool force)
{
int rc = 0;
struct msm_vidc_inst *inst, *dummy;
@@ -2466,10 +2461,14 @@ int msm_vidc_core_deinit(struct msm_vidc_core *core)
d_vpr_e("%s: invalid params\n", __func__);
return -EINVAL;
}
mutex_lock(&core->lock);
d_vpr_h("%s()\n", __func__);
if (core->state == MSM_VIDC_CORE_DEINIT)
goto unlock;
if (!force)
if (!list_empty(&core->instances))
goto unlock;
venus_hfi_core_deinit(core);
msm_vidc_deinit_instance_caps(core);
@@ -2542,7 +2541,7 @@ unlock:
int msm_vidc_core_timeout(struct msm_vidc_core *core)
{
return msm_vidc_core_deinit(core);
return msm_vidc_core_deinit(core, true);
}
int msm_vidc_smmu_fault_handler(struct iommu_domain *domain,
@@ -2567,6 +2566,20 @@ void msm_vidc_pm_work_handler(struct work_struct *work)
void msm_vidc_fw_unload_handler(struct work_struct *work)
{
struct msm_vidc_core *core = NULL;
int rc = 0;
core = container_of(work, struct msm_vidc_core, fw_unload_work.work);
if (!core) {
d_vpr_e("%s: invalid work or core handle\n", __func__);
return;
}
d_vpr_h("%s: deinitializing video core\n",__func__);
rc = msm_vidc_core_deinit(core, false);
if (rc)
d_vpr_e("%s: Failed to deinit core\n", __func__);
}
void msm_vidc_batch_handler(struct work_struct *work)
@@ -2811,3 +2824,23 @@ int msm_vidc_update_meta_port_settings(struct msm_vidc_inst *inst)
}
return 0;
}
void msm_vidc_schedule_core_deinit(struct msm_vidc_core *core)
{
if (!core)
return;
if (!core->capabilities[FW_UNLOAD].value)
return;
cancel_delayed_work(&core->fw_unload_work);
schedule_delayed_work(&core->fw_unload_work,
msecs_to_jiffies(core->capabilities[FW_UNLOAD_DELAY].value));
d_vpr_h("firmware unload delayed by %u ms\n",
core->capabilities[FW_UNLOAD_DELAY].value);
return;
}

2
driver/vidc/src/venus_hfi_response.c
View File

@@ -230,7 +230,7 @@ static int handle_system_error(struct msm_vidc_core *core,
struct hfi_packet *pkt)
{
d_vpr_e("%s: system error received\n", __func__);
msm_vidc_core_deinit(core);
msm_vidc_core_deinit(core, true);
return 0;
}