Merge "msm: cpp: Set GDRC register set after FW load" (7f39326d) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -1129,12 +1129,6 @@ static int cpp_init_hardware(struct cpp_device *cpp_dev)
		}
		}

		rc = msm_cpp_update_gdscr_status(cpp_dev, true);
		if (rc < 0) {
		pr_err("update cpp gdscr status failed\n");
		goto req_irq_fail;
		}

		cpp_dev->hw_info.cpp_hw_version =
		msm_camera_io_r(cpp_dev->cpp_hw_base);
		if (cpp_dev->hw_info.cpp_hw_version == CPP_HW_VERSION_4_1_0) {
		@@ -1376,6 +1370,10 @@ static int32_t cpp_load_fw(struct cpp_device cpp_dev, char fw_name_bin)
		MSM_CPP_MSG_ID_JUMP_ACK, rc);
		}

		rc = msm_cpp_update_gdscr_status(cpp_dev, true);
		if (rc < 0)
		pr_err("update cpp gdscr status failed\n");

		end:
		return rc;
		}