hal: Branch 'master'

[Richard Hughes]

 doc/spec/hal-spec-properties.xml             |    8 ++++++++
 tools/linux/hal-system-power-hibernate-linux |    1 +
 tools/linux/hal-system-power-suspend-linux   |    1 +
 3 files changed, 10 insertions(+)

New commits:
diff-tree 7b83d3fae632f62cef2edc6729911e4192426824 (from c62548b8192a28c9a4a330e456a7febfe39a5d09)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Feb 20 21:30:03 2007 +0000

    add --quirk-radeon-off
    
    On Tue, 2007-02-20 at 20:27 +0000, Richard Hughes wrote:
    > On Tue, 2007-02-20 at 15:19 -0500, Peter Jones wrote:
    > >
    > > David and I were talking about the quirk- thing on irc, and decided to
    > > leave it in.  It doesn't hurt anything, and it makes them sort into
    > > one
    > > block in e.g. the --help output.
    >
    > Cool, fine for me. David, okay to commit the HAL side of the patch?
    
    Sure; remember to add the --quirk-radeon-off stuff too. Thanks!
    
        David

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 3a5813e..5e5aa2a 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -5664,6 +5664,14 @@
               <entry>No</entry>
               <entry>Save the VGA BIOS mode before suspend, and restore it on resume.</entry>
             </row>
+            <row>
+              <entry>
+                <literal>power_management.quirk.radeon_off</literal> (bool)
+              </entry>
+              <entry></entry>
+              <entry>No</entry>
+              <entry>Turn off the Radeon DAC off before suspend.</entry>
+            </row>
           </tbody>
         </tgroup>
       </informaltable>
diff --git a/tools/linux/hal-system-power-hibernate-linux b/tools/linux/hal-system-power-hibernate-linux
index d17a8e8..250e191 100755
--- a/tools/linux/hal-system-power-hibernate-linux
+++ b/tools/linux/hal-system-power-hibernate-linux
@@ -22,6 +22,7 @@ QUIRKS=""
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3" = "true" ] && QUIRKS="$QUIRKS --quirk-vga-mode3"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbepost"
+[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RADEON_OFF" = "true" ] && QUIRKS="$QUIRKS --quirk-radeon-off"
 
 #ALTLinux only supports powersave
 if [ -f /etc/altlinux-release ] ; then
diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
index 1dd1a68..8139842 100755
--- a/tools/linux/hal-system-power-suspend-linux
+++ b/tools/linux/hal-system-power-suspend-linux
@@ -30,6 +30,7 @@ QUIRKS=""
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBEMODE_RESTORE" = "true" ] && QUIRKS="$QUIRKS --quirk-vbemode"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3" = "true" ] && QUIRKS="$QUIRKS --quirk-vga-mode3"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbepost"
+[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RADEON_OFF" = "true" ] && QUIRKS="$QUIRKS --quirk-radeon-off"
 
 #PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl
 if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "pmu" ]; then