omap: mach-omap2: don't wake ipu from hibernation for suspend

If the IPU subsystem has hibernated, there is no need to wake it up
and forward suspend notifications. Also, resume notifications will
not be forwarded to the IPU SS if it has hibernated. This is because
self-hibernation only occurs when no resources are in use. In this
case the SysLink PM context save/restore should be all that is needed.

Change-Id: I892e58b569d922038db8fb8604d1432087235f75
Signed-off-by: Miguel Vadillo <[email protected]>
Signed-off-by: Paul Hunt <[email protected]>
Signed-off-by: Juan Gutierrez  <[email protected]>
Signed-off-by: Axel Haslam <[email protected]>

Author: Miguel Vadillo

arch/arm/mach-omap2/ipu_drv.c

@@ -48,6 +48,7 @@ static struct class *omap_ipu_pm_class;
 static dev_t omap_ipu_pm_dev;
 
 int ipu_pm_first_dev;
+int need_resume_notifications;
 
 static struct proc_dir_entry *ipu_pm_proc_entry;
 /* we could iterate over something much more
@@ -180,6 +181,8 @@ static int __devinit ipu_pm_probe(struct platform_device *pdev)
 	/* int id = pdev->id; */
 	/* ivahd.pdev = pdev; */
 
+	need_resume_notifications = 0;
+
 	if (!is_driver_init) {
 		is_driver_init = 1;
 		/* FIXME: maybe needed for multiple dev */
@@ -210,18 +213,26 @@ static int ipu_pm_drv_suspend(struct device *dev)
 		 */
 		/* call notification function */
 		if (ipu_pm_get_handle(APP_M3)) {
-			retval = ipu_pm_notifications(APP_M3, PM_SUSPEND, NULL);
-			if (retval)
-				goto error;
+			if (!(ipu_pm_get_state(APP_M3) & APP_PROC_DOWN)) {
+				retval = ipu_pm_notifications(APP_M3,
+							      PM_SUSPEND, NULL);
+				if (retval)
+					goto error;
+			}
 		}
 		if (ipu_pm_get_handle(SYS_M3)) {
-			retval = ipu_pm_notifications(SYS_M3, PM_SUSPEND, NULL);
-			if (retval)
-				goto error;
-			/* sysm3 is handling hibernation of ducati currently */
-			ipu_pm_save_ctx(SYS_M3);
+			if (!(ipu_pm_get_state(SYS_M3) & SYS_PROC_DOWN)) {
+				retval = ipu_pm_notifications(SYS_M3,
+							      PM_SUSPEND, NULL);
+				if (retval)
+					goto error;
+				/* sysm3 is handling hibernation of ducati
+				 * currently
+				 */
+				ipu_pm_save_ctx(SYS_M3);
+				need_resume_notifications = 1;
+			}
 		}
-
 		/* return result, should be zero if all Ducati clients
 		 * returned zero else fail code
 		 */
@@ -242,15 +253,20 @@ static int ipu_pm_drv_resume(struct device *dev)
 		 */
 
 		/* call our notification function */
-		if (ipu_pm_get_handle(APP_M3)) {
-			retval = ipu_pm_notifications(APP_M3, PM_RESUME, NULL);
-			if (retval)
-				goto error;
-		}
-		if (ipu_pm_get_handle(SYS_M3)) {
-			retval = ipu_pm_notifications(SYS_M3, PM_RESUME, NULL);
-			if (retval)
-				goto error;
+		if (need_resume_notifications) {
+			if (ipu_pm_get_handle(APP_M3)) {
+				retval = ipu_pm_notifications(APP_M3,
+							       PM_RESUME, NULL);
+				if (retval)
+					goto error;
+			}
+			if (ipu_pm_get_handle(SYS_M3)) {
+				retval = ipu_pm_notifications(SYS_M3,
+							       PM_RESUME, NULL);
+				if (retval)
+					goto error;
+			}
+			need_resume_notifications = 0;
 		}
 
 		/* return result, should be zero if all Ducati clients

drivers/dsp/syslink/ipu_pm/ipu_pm.c

@@ -2328,6 +2328,7 @@ u32 ipu_pm_get_state(int proc_id)
 
 	return handle->rcb_table->state_flag;
 }
+EXPORT_SYMBOL(ipu_pm_get_state);
 
 /*
   Function to get ipu pm object