diff mbox

[3/3] README: Documentation for s2ram options

Message ID 1362998781-4651-4-git-send-email-kix@kix.es (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Rodolfo García Peñas (kix) March 11, 2013, 10:46 a.m. UTC
From: "Rodolfo García Peñas (kix)" <kix@kix.es>

This patch includes the documentation to use the s2ram options, for
the configuration file and the command line.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>
---
 README |   50 ++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/README b/README
index 8ec0dd6..d5f493c 100644
--- a/README
+++ b/README
@@ -45,10 +45,48 @@  three different methods to suspend the machine:
 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).
+   using the argument "-k" in s2ram (s2ram -k). Is possible test if the
+   kernel supports KMS using the argument "-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.
+   are included, s2ram use them, else, the whitelist is used. Is possible
+   test if the machine is in the whitelist using the argument "-n".
+
+The full table of options is:
+
+User want    = What the user needs for their machine (KMS, Whitelist or their
+               own specific quirks).
+KMS support? = If the kernel has KMS support enabled.
+In WL?       = If the machine is included in the whitelist.
+Command Line = What should do the user in the command line (s2ram options).
+Config File  = What should include the user in the configuration file.
+N/A          = Yes and No, for both cases.
+Not possible = This option cannot be used!.
+Nothing      = The user must not include s2ram_force, s2ram_quirks and
+               s2ram_quirks lines in the configuration file.
+"<quirks>"   = Quirks options to be used. In command line these options are
+               --vbe_save, --vbe_post,... and in the config file are
+               vbe_save, vb_post (same options, without the "--").
+
+User want | KMS support? | In WL? | Command Line   | Config File
+==========+==============+========+================+========================
+          | No           | N/A    | Not possible   | Not possible
+KMS (-K)  +--------------+--------+----------------+------------------------
+          | Yes          | N/A    | No arguments   | Nothing
+==========+==============+========+================+========================
+          | N/A          | No     | Not possible   | Not possible
+          +--------------+--------+----------------+------------------------
+WL  (-n)  | No           | Yes    | No arguments   | Nothing
+          +--------------+--------+----------------+------------------------
+          | Yes          | Yes    | -k             | s2ram_disable_kms = y
+==========+==============+========+================+========================
+          | No           | N/A    | -f <quirks>    | s2ram_force = y
+          |              |        |                | s2ram_quirks = <quirks>
+User      +--------------+--------+----------------+------------------------
+Quirks    | Yes          | N/A    | -k -f <quirks> | s2ram_disable_kms = y
+          |              |        |                | s2ram_force = y
+          |              |        |                | s2ram_quirks = <quirks>
+----------+--------------+--------+----------------+------------------------
 
 You need libx86 installed to build s2ram, the HOWTO document explains how to
 install it.
@@ -61,16 +99,16 @@  can resume the system from disk using the resume tool otherwise  However, this
 is only possible if your box is present in the s2ram whitelist.
 
 To build the s2ram and s2both tools you will need the pciutils-devel
-(pciutils-dev) package and the libx86-dev package (which you can get from 
-http://www.codon.org.uk/~mjg59/libx86/downloads/). They are necessary to 
-compile the vbetool code (the vbetool code is based on vbetool-1.0 from 
+(pciutils-dev) package and the libx86-dev package (which you can get from
+http://www.codon.org.uk/~mjg59/libx86/downloads/). They are necessary to
+compile the vbetool code (the vbetool code is based on vbetool-1.0 from
 http://www.codon.org.uk/~mjg59/vbetool/). With newer pciutils (2.2.4 and
 above) you also have to install the zlib development package (zlib-devel on
 SUSE, zlib1g-dev on Debian).
 
 For debugging, see http://suspend.sf.net/s2ram-support.html.
 
-acpi-support package from Ubuntu has *very* long whitelist of machines: 
+acpi-support package from Ubuntu has *very* long whitelist of machines:
 http://packages.ubuntu.org.cn/dapper/admin/acpi-support that are likely to
 work with s2ram.