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-13 16:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: vidc: Handoff regulators after firmware loading is complete"

Browse source
This commit is contained in:
qctecmdr 2019-05-11 10:55:18 -07:00 • committed by Gerrit - the friendly Code Review server
commit 95c67930db
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
msm/vidc/hfi_common.c
View file

@ -4431,15 +4431,6 @@ static int __venus_power_on(struct venus_hfi_device *device)
device->intr_status = 0;
enable_irq(device->hal_data->irq);
/*
* Hand off control of regulators to h/w _after_ enabling clocks.
* Note that the GDSC will turn off when switching from normal
* (s/w triggered) to fast (HW triggered) unless the h/w vote is
* present. Since Venus isn't up yet, the GDSC will be off briefly.
*/
if (__enable_hw_power_collapse(device))
dprintk(VIDC_ERR, "Failed to enabled inter-frame PC\n");
return rc;
fail_enable_clks:
@ -4535,6 +4526,15 @@ static inline int __resume(struct venus_hfi_device *device)
goto err_set_video_state;
}
/*
* Hand off control of regulators to h/w _after_ loading fw.
* Note that the GDSC will turn off when switching from normal
* (s/w triggered) to fast (HW triggered) unless the h/w vote is
* present.
*/
if (__enable_hw_power_collapse(device))
dprintk(VIDC_ERR, "Failed to enabled inter-frame PC\n");
call_venus_op(device, setup_ucregion_memmap, device);
/* Wait for boot completion */
@ -4621,6 +4621,15 @@ static int __load_fw(struct venus_hfi_device *device)
goto fail_protect_mem;
}
}
/*
* Hand off control of regulators to h/w _after_ loading fw.
* Note that the GDSC will turn off when switching from normal
* (s/w triggered) to fast (HW triggered) unless the h/w vote is
* present.
*/
if (__enable_hw_power_collapse(device))
dprintk(VIDC_ERR, "Failed to enabled inter-frame PC\n");
trace_msm_v4l2_vidc_fw_load_end("msm_v4l2_vidc venus_fw load end");
return rc;
fail_protect_mem: