commit a6c9906a674a0d6c8176db978398d7ae33df775c
author Chien-Yu Chen <cychen@google.com> Tue May 23 13:45:06 2017 -0700
committer Arnd Geis <arndg@google.com> Wed May 31 17:09:56 2017 -0700
tree 9b0a4ab95c0068966d7fcd81eee93261615ac2a1
parent 08834bf4728400d426ebf8b7a44a59c0b64f4faf

QCamera3: Enable MIPI to IPU in HDR+ mode

Bug: 36537557
Change-Id: If8c90d9fb1a4338bd6225d075c7c9508699c7cf4

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index 871f8cb..970b2e3 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -5850,7 +5850,8 @@
                     Mutex::Autolock l(gHdrPlusClientLock);
                     if (EaselManagerClientOpened) {
                         logEaselEvent("EASEL_STARTUP_LATENCY", "Starting MIPI");
-                        rc = gEaselManagerClient.startMipi(mCameraId, mSensorModeInfo.op_pixel_clk);
+                        rc = gEaselManagerClient.startMipi(mCameraId, mSensorModeInfo.op_pixel_clk,
+                                /*enableIpu*/true);
                         if (rc != OK) {
                             ALOGE("%s: Failed to start MIPI rate for camera %u to %u", __FUNCTION__,
                                     mCameraId, mSensorModeInfo.op_pixel_clk);
@@ -14387,6 +14388,10 @@
 {
     status_t res;
 
+    if (mHdrPlusModeEnabled) {
+        return OK;
+    }
+
     // Check if gHdrPlusClient is opened or being opened.
     if (gHdrPlusClient == nullptr) {
         if (gHdrPlusClientOpening) {