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-12 15:49:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: isp: Correct error check in clock rate assignment" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Camera Software Integration 2021-08-11 00:42:26 -07:00 • committed by Gerrit - the friendly Code Review server
commit 12c6f510f4
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c
View file

@ -1965,6 +1965,12 @@ int cam_tfe_cshiphy_callback(
&ctx->res_list_tfe_csid, list) {
rc = cam_tfe_hw_mgr_update_clock_rate(hw_mgr_res,
phy_clock_rate, &updated_csid_clk);
if (rc) {
CAM_ERR(CAM_ISP,
"csid clock update failed: %d, csid:%lld tfe:%lld",
rc, csid_clock_rate, tfe_clock_rate);
goto end;
}
}
if (updated_csid_clk > tfe_clock_rate) {
@ -1972,9 +1978,15 @@ int cam_tfe_cshiphy_callback(
&ctx->res_list_tfe_in, list) {
rc = cam_tfe_hw_mgr_update_clock_rate(hw_mgr_res,
&updated_csid_clk, &updated_tfe_clk);
if (rc) {
CAM_ERR(CAM_ISP,
"tfe clock update failed: %d, csid:%lld tfe:%lld",
rc, updated_csid_clk, tfe_clock_rate);
goto end;
}
}
}
goto end;
goto skip_tfe_update;
}
if (csid_clock_rate > tfe_clock_rate) {
@ -1982,9 +1994,16 @@ int cam_tfe_cshiphy_callback(
&ctx->res_list_tfe_in, list) {
rc = cam_tfe_hw_mgr_update_clock_rate(hw_mgr_res,
&csid_clock_rate, &updated_tfe_clk);
if (rc) {
CAM_ERR(CAM_ISP,
"tfe clock update failed: %d, csid:%lld tfe:%lld",
rc, csid_clock_rate, tfe_clock_rate);
goto end;
}
}
}
skip_tfe_update:
if (!updated_csid_clk)
updated_csid_clk = csid_clock_rate;