aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodolfo García Peñas <kix@kix.es>2012-09-15 22:23:27 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2012-09-15 22:23:27 +0200
commit00ded771bd99cdcdca039c564f769a47d87b9389 (patch)
tree22bcc53bb91b28c4b6a58826253039fcfa11e903
parentf58e33494ffb3a221fc3ac6c313ecc8a5d9e7f65 (diff)
downloadsuspend-utils-00ded771bd99cdcdca039c564f769a47d87b9389.tar.gz
README: README file updated with new options
The README file is now updated to include the support of the configuration file option and parameter. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--README35
1 files changed, 29 insertions, 6 deletions
diff --git a/README b/README
index 7877338..8ec0dd6 100644
--- a/README
+++ b/README
@@ -24,11 +24,34 @@ these utilities and installation instructions.
The s2ram tool allows you to suspend the system to RAM and restore the state
of the graphics adapter after the resume automatically. For this purpose it
uses the code out of vbetool and radeontool utilities, needed for handling
-quite a lot of graphics cards after the resume from RAM. It also contains a
-whitelist of machines that are known to work with it. Please refer to the
-document README.s2ram-whitelist in this package for more information about the
-s2ram whitelist. You need libx86 installed to build s2ram, the HOWTO document
-explains how to install it.
+quite a lot of graphics cards after the resume from RAM. The s2ram tool uses
+three different methods to suspend the machine:
+
+- KMS: s2ram try first suspend the machine using KMS (Kernel Mode Set) if the
+ kernel supports it. With this method s2ram don't need extra parameters
+ (quirks).
+- Whitelist: s2ram has a whitelist of machines that are known to work with it.
+ This whitelist includes the quirks to suspend known machines. The whitelist
+ was used prior to suspend-utils version 1.0, and now the whitelist is not
+ updated. The database is used because has a lot of machines included and
+ many users are using it. Please refer to the document README.s2ram-whitelist
+ in this package for more information about the s2ram whitelist.
+- Configuration file: s2ram can use the configuration file to read the extra
+ parameters (quirks). This option is useful if the kernel don't support KMS
+ (for example, kernel compiled without support), if the machine is not
+ included in the whitelist (for example, new machines) or if the user wants
+ to override the quirks of the whitelist file.
+
+The flow of options is:
+
+1. If the kernel supports KMS, then use it. This option can be overriding
+ using the argument "-k" in s2ram (s2ram -k).
+2. If the kernel don't support KMS, or the user override it, then s2ram
+ checks if the configuration file has the parameters. If the parameters
+ are included, s2ram use them, else, the whitelist is used.
+
+You need libx86 installed to build s2ram, the HOWTO document explains how to
+install it.
The s2both tool combines the functionalities of s2disk and s2ram. With the
help of it the system may be suspended to RAM after the suspend-to-disk
@@ -55,4 +78,4 @@ To compile this beast from CVS, do:
./autogen.sh
./configure
-make \ No newline at end of file
+make