A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 23:24:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: vidc: Cancel batch work in case of pm_suspend"

Browse source
This commit is contained in:
qctecmdr 2021-10-18 23:17:08 -07:00 • committed by Gerrit - the friendly Code Review server
commit 6602b657ee
3 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
msm/vidc/msm_v4l2_vidc.c
View file

@ -677,6 +677,7 @@ static int msm_vidc_pm_suspend(struct device *dev)
int rc = 0;
struct msm_vidc_core *core;
d_vpr_h("%s\n", __func__);
/*
* Bail out if
* - driver possibly not probed yet
@ -698,14 +699,33 @@ static int msm_vidc_pm_suspend(struct device *dev)
rc = 0;
else if (rc)
d_vpr_e("Failed to suspend: %d\n", rc);
else
core->pm_suspended = true;
return rc;
}
static int msm_vidc_pm_resume(struct device *dev)
{
struct msm_vidc_core *core;
d_vpr_h("%s\n", __func__);
/*
* Bail out if
* - driver possibly not probed yet
* - not the main device. We don't support power management on
* subdevices (e.g. context banks)
*/
if (!dev || !dev->driver ||
!of_device_is_compatible(dev->of_node, "qcom,msm-vidc"))
return 0;
core = dev_get_drvdata(dev);
if (!core) {
d_vpr_e("%s: invalid core\n", __func__);
return -EINVAL;
}
core->pm_suspended = false;
return 0;
}

11
msm/vidc/msm_vidc_common.c
View file

@ -3054,6 +3054,7 @@ static int msm_comm_init_core(struct msm_vidc_inst *inst)
core->state = VIDC_CORE_INIT;
core->smmu_fault_handled = false;
core->trigger_ssr = false;
core->pm_suspended = false;
core->resources.max_secure_inst_count =
core->resources.max_secure_inst_count ?
core->resources.max_secure_inst_count :
@ -4540,10 +4541,11 @@ void msm_vidc_batch_handler(struct work_struct *work)
{
int rc = 0;
struct msm_vidc_inst *inst;
struct msm_vidc_core *core;
inst = container_of(work, struct msm_vidc_inst, batch_work.work);
inst = get_inst(get_vidc_core(MSM_VIDC_CORE_VENUS), inst);
if (!inst) {
if (!inst || !inst->core) {
d_vpr_e("%s: invalid params\n", __func__);
return;
}
@ -4553,9 +4555,14 @@ void msm_vidc_batch_handler(struct work_struct *work)
goto exit;
}
core = inst->core;
if (core->pm_suspended) {
s_vpr_h(inst->sid, "%s: device in pm suspend state\n", __func__);
goto exit;
}
s_vpr_h(inst->sid, "%s: queue pending batch buffers\n",
__func__);
rc = msm_comm_qbufs_batch(inst, NULL);
if (rc) {
s_vpr_e(inst->sid, "%s: batch qbufs failed\n", __func__);

1
msm/vidc/msm_vidc_internal.h
View file

@ -508,6 +508,7 @@ struct msm_vidc_core {
unsigned long min_freq;
unsigned long curr_freq;
struct msm_vidc_core_ops *core_ops;
bool pm_suspended;
};
struct msm_vidc_inst;