Merge lp:~hzliu123/ubuntu/precise/pm-utils/fix-for-1172692 into lp:ubuntu/precise/pm-utils

[Hao-Ran Liu]

In-kernel suspend to both ram and disk has been supported since kernel 3.6.
This patch add the support and has been verified and works correctly on
Ubuntu trusty and precise with 3.11 kernel.

In order to support hybrid suspend in 12.04.4, Canonical OEM projects would
like this patch upstreamed.

[Martin Pitt (pitti)]

Thanks! I cannot formally merge that as the precise-proposed branch doesn't exist yet. But I uploaded the package to the SRU review queue, thus closing manually.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-16 15:55:45 +0000
+++ debian/changelog	2013-11-04 08:32:10 +0000
@@ -1,3 +1,9 @@
+pm-utils (1.4.1-9ubuntu1) precise; urgency=low
+
+  * Add support for in-kernel suspend to both (LP: #1172692)
+
+ -- Hao-Ran Liu (Joseph Liu) <[e-mail]>  Mon, 04 Nov 2013 15:39:45 +0800
+
 pm-utils (1.4.1-9) unstable; urgency=low
 
   * Add 26-inhibit-on-right-status.patch: Do not use the exit status of log

=== added file 'debian/patches/28-suspend-hybrid.patch'
--- debian/patches/28-suspend-hybrid.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/28-suspend-hybrid.patch	2013-11-04 08:32:10 +0000
@@ -0,0 +1,39 @@
+Description: Add support for in-kernel suspend to both
+Author: Bojan Smojver <[e-mail]>
+Author: Jaroslav Škarvada <[e-mail]>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=52572
+Bug-Ubuntu: https://launchpad.net/bugs/1172692
+
+Index: pm-utils/pm/pm-functions.in
+===================================================================
+--- pm-utils.orig/pm/pm-functions.in	2013-11-01 17:03:17.371325000 +0800
++++ pm-utils/pm/pm-functions.in	2013-11-01 17:59:36.803067865 +0800
+@@ -336,8 +336,28 @@
+ 	{
+ 		[ -n "${HIBERNATE_MODE}" ] && \
+ 		grep -qw "${HIBERNATE_MODE}" /sys/power/disk && \
++		HIBERNATE_MODE_SAVE=$(cat /sys/power/disk) && \
++		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE##*[}" && \
++		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE%%]*}" && \
+ 		echo -n "${HIBERNATE_MODE}" > /sys/power/disk
+ 		echo -n "disk" > /sys/power/state
++		RET=$?
++		echo -n "$HIBERNATE_MODE_SAVE" > /sys/power/disk
++		return "$RET"
++	}
++fi
++
++# for kernels that support suspend to both (i.e. hybrid suspend)
++# since kernel 3.6
++if [ -z "$SUSPEND_HYBRID_MODULE" ] && \
++	[ -f /sys/power/disk ] && \
++	grep -q disk /sys/power/state && \
++	grep -q suspend /sys/power/disk; then
++	SUSPEND_HYBRID_MODULE="kernel"
++	do_suspend_hybrid()
++	{
++		HIBERNATE_MODE="suspend"
++		do_hibernate
+ 	}
+ fi
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-01-16 15:55:45 +0000
+++ debian/patches/series	2013-11-04 08:32:10 +0000
@@ -9,5 +9,6 @@
 14-disable-sata-alpm.patch
 25-pmu.patch
 26-inhibit-on-right-status.patch
+28-suspend-hybrid.patch
 80-service.patch
 90-nm-proper-wakeup.patch

=== modified file 'pm/pm-functions.in'
--- pm/pm-functions.in	2011-07-08 15:02:58 +0000
+++ pm/pm-functions.in	2013-11-04 08:32:10 +0000
@@ -336,8 +336,28 @@
 	{
 		[ -n "${HIBERNATE_MODE}" ] && \
 		grep -qw "${HIBERNATE_MODE}" /sys/power/disk && \
+		HIBERNATE_MODE_SAVE=$(cat /sys/power/disk) && \
+		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE##*[}" && \
+		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE%%]*}" && \
 		echo -n "${HIBERNATE_MODE}" > /sys/power/disk
 		echo -n "disk" > /sys/power/state
+		RET=$?
+		echo -n "$HIBERNATE_MODE_SAVE" > /sys/power/disk
+		return "$RET"
+	}
+fi
+
+# for kernels that support suspend to both (i.e. hybrid suspend)
+# since kernel 3.6
+if [ -z "$SUSPEND_HYBRID_MODULE" ] && \
+	[ -f /sys/power/disk ] && \
+	grep -q disk /sys/power/state && \
+	grep -q suspend /sys/power/disk; then
+	SUSPEND_HYBRID_MODULE="kernel"
+	do_suspend_hybrid()
+	{
+		HIBERNATE_MODE="suspend"
+		do_hibernate
 	}
 fi