Merge branch 'oneplus/oneplus/QC8998_P_9.0_Beta' at 1e5c686

* oneplus/oneplus/QC8998_P_9.0_Beta:
  Improve camera power consumption
  Optimized sRGB display mode
  Disble ZRAM
  Improve stabiltiy

Author: joshchoo

arch/arm64/configs/msmcortex-oqc_defconfig

@@ -252,7 +252,7 @@ CONFIG_IPC_ROUTER_SECURITY=y
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y
 CONFIG_DMA_CMA=y
-CONFIG_ZRAM=y
+# CONFIG_ZRAM is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192

arch/arm64/configs/msmcortex-perf_defconfig

@@ -248,7 +248,7 @@ CONFIG_IPC_ROUTER_SECURITY=y
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 CONFIG_DMA_CMA=y
 # CONFIG_PNP_DEBUG_MESSAGES is not set
-CONFIG_ZRAM=y
+# CONFIG_ZRAM is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192

arch/arm64/configs/msmcortex_defconfig

@@ -251,7 +251,7 @@ CONFIG_IPC_ROUTER_SECURITY=y
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
 CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y
 CONFIG_DMA_CMA=y
-CONFIG_ZRAM=y
+# CONFIG_ZRAM is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192

drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c

@@ -152,6 +152,7 @@ int msm_sensor_power_up(struct msm_sensor_ctrl_t *s_ctrl)
 	struct msm_camera_slave_info *slave_info;
 	const char *sensor_name;
 	uint32_t retry = 0;
+	uint32_t check_id_retry = 0;
 
 	if (!s_ctrl) {
 		pr_err("%s:%d failed: %pK\n",
@@ -203,7 +204,13 @@ int msm_sensor_power_up(struct msm_sensor_ctrl_t *s_ctrl)
 			sensor_i2c_client);
 		if (rc < 0)
 			return rc;
-		rc = msm_sensor_check_id(s_ctrl);
+
+		for(check_id_retry = 0; check_id_retry < 3; check_id_retry++) {
+			rc = msm_sensor_check_id(s_ctrl);
+			if (!rc) break;
+			msleep(20);
+		}
+
 		if (rc < 0) {
 			msm_camera_power_down(power_info,
 				s_ctrl->sensor_device_type, sensor_i2c_client);

drivers/video/fbdev/msm/mdss_dsi_panel.c

@@ -1394,7 +1394,7 @@ static int mdss_dsi_panel_on(struct mdss_panel_data *pdata)
 	mutex_lock(&ctrl->panel_mode_lock);
 	ctrl->is_panel_on = true;
 	mutex_unlock(&ctrl->panel_mode_lock);
-
+/*
 	if (mdss_dsi_panel_get_srgb_mode(ctrl)) {
 		mdss_dsi_panel_set_srgb_mode(ctrl,
 			mdss_dsi_panel_get_srgb_mode(ctrl));
@@ -1423,7 +1423,7 @@ static int mdss_dsi_panel_on(struct mdss_panel_data *pdata)
 		mdss_dsi_panel_set_adaption_mode(ctrl,
 		   mdss_dsi_panel_get_adaption_mode(ctrl));
 	}
-
+*/
 
 #if defined(CONFIG_IRIS2P_FULL_SUPPORT)
 #if !defined(WITHOUT_IRIS)
@@ -1452,6 +1452,34 @@ static int mdss_dsi_panel_on(struct mdss_panel_data *pdata)
  end:
 	 pr_debug("%s:-\n", __func__);
     pr_err("%s end\n", __func__);
+    if (mdss_dsi_panel_get_srgb_mode(ctrl)) {
+		mdss_dsi_panel_set_srgb_mode(ctrl,
+			mdss_dsi_panel_get_srgb_mode(ctrl));
+	}
+
+	if (mdss_dsi_panel_get_adobe_rgb_mode(ctrl)) {
+		mdss_dsi_panel_set_adobe_rgb_mode(ctrl,
+			mdss_dsi_panel_get_adobe_rgb_mode(ctrl));
+	}
+
+	if (mdss_dsi_panel_get_dci_p3_mode(ctrl)) {
+		mdss_dsi_panel_set_dci_p3_mode(ctrl,
+			mdss_dsi_panel_get_dci_p3_mode(ctrl));
+	}
+
+	if (mdss_dsi_panel_get_night_mode(ctrl)) {
+		mdss_dsi_panel_set_night_mode(ctrl,
+		mdss_dsi_panel_get_night_mode(ctrl));
+	}
+	if (mdss_dsi_panel_get_oneplus_mode(ctrl)) {
+		mdss_dsi_panel_set_oneplus_mode(ctrl,
+			mdss_dsi_panel_get_oneplus_mode(ctrl));
+	}
+
+	if (mdss_dsi_panel_get_adaption_mode(ctrl)) {
+		mdss_dsi_panel_set_adaption_mode(ctrl,
+		   mdss_dsi_panel_get_adaption_mode(ctrl));
+	}
 	 return ret;
 }
 

kernel/power/suspend.c

@@ -49,6 +49,11 @@ static DECLARE_WAIT_QUEUE_HEAD(suspend_freeze_wait_head);
 enum freeze_state __read_mostly suspend_freeze_state;
 static DEFINE_SPINLOCK(suspend_freeze_lock);
 
+static bool sys_sync_completed = false;
+static void sys_sync_work_func(struct work_struct *work);
+static DECLARE_WORK(sys_sync_work, sys_sync_work_func);
+static DECLARE_WAIT_QUEUE_HEAD(sys_sync_wait);
+
 void freeze_set_ops(const struct platform_freeze_ops *ops)
 {
 	lock_system_sleep();
@@ -480,6 +485,55 @@ static void suspend_finish(void)
 	pm_restore_console();
 }
 
+/**
+ * Sync the filesystem in seperate workqueue.
+ * Then check it finishing or not periodically and
+ * abort if any wakeup source comes in. That can reduce
+ * the wakeup latency
+ *
+ */
+static void sys_sync_work_func(struct work_struct *work)
+{
+	printk(KERN_INFO "PM: Syncing filesystems ... \n");
+	sys_sync();
+	sys_sync_completed = true;
+	wake_up(&sys_sync_wait);
+}
+
+static int sys_sync_queue(void)
+{
+	int work_status = work_busy(&sys_sync_work);
+
+	/*Check if the previous work still running.*/
+	if (!(work_status & WORK_BUSY_PENDING)) {
+		if (work_status & WORK_BUSY_RUNNING) {
+			while (wait_event_timeout(sys_sync_wait, sys_sync_completed,
+						msecs_to_jiffies(100)) == 0) {
+				if (pm_wakeup_pending()) {
+					pr_info("PM: Pre-Syncing abort\n");
+					goto abort;
+				}
+			}
+			pr_info("PM: Pre-Syncing done\n");
+		}
+		sys_sync_completed = false;
+		schedule_work(&sys_sync_work);
+	}
+
+	while (wait_event_timeout(sys_sync_wait, sys_sync_completed,
+					msecs_to_jiffies(100)) == 0) {
+		if (pm_wakeup_pending()) {
+			pr_info("PM: Syncing abort\n");
+			goto abort;
+		}
+	}
+
+	pr_info("PM: Syncing done\n");
+	return 0;
+abort:
+	return -EAGAIN;
+}
+
 /**
  * enter_state - Do common work needed to enter system sleep state.
  * @state: System sleep state to enter.
@@ -513,7 +567,10 @@ static int enter_state(suspend_state_t state)
 #ifndef CONFIG_SUSPEND_SKIP_SYNC
 	trace_suspend_resume(TPS("sync_filesystems"), 0, true);
 	printk(KERN_INFO "PM: Syncing filesystems ... ");
-	sys_sync();
+	error = sys_sync_queue();
+	if (error) {
+		goto Unlock;
+	}
 	printk("done.\n");
 	trace_suspend_resume(TPS("sync_filesystems"), 0, false);
 #endif