hal: Branch 'origin'

[David Zeuthen]

 fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi    |   21 ++++++++
 fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi    |   17 ++++++
 fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi      |   12 ++++
 fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi    |   30 +++++++++++-
 fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi |    7 ++
 5 files changed, 86 insertions(+), 1 deletion(-)

New commits:
diff-tree 4e2263d31ede8eda833a23b4fe2fcc876eb65daf (from bbcd5e8032230d290b21ef5b5a5fdb02762b46b2)
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri May 4 12:52:20 2007 +0100

    add some new video resume quirks
    
    Add some new confirmed quirks from the suspend-0.5 package.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 739c54f..ebfc10a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -23,12 +23,33 @@
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
       </match>
+      <match key="system.hardware.product" prefix="TravelMate 240">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+      </match>
+      <!-- TravelMate 630Lci -->
+      <match key="system.hardware.product" prefix="TravelMate 630">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
+      <match key="system.hardware.product" prefix="TravelMate 4100">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+      </match>
       <match key="system.hardware.product" prefix="Aspire">
         <match key="system.hardware.product" contains="1690">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
           <merge key="power_management.quirk.no_fb" type="bool">true</merge>
         </match>
+        <match key="system.hardware.product" contains="3610">
+          <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+          <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+        </match>
+        <match key="system.hardware.product" contains="3620">
+          <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+          <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+        </match>
       </match>
       <match key="system.hardware.product" string="Extensa 4150">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 79a6627..4922612 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -19,6 +19,23 @@
       <match key="system.hardware.product" string="V6V">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" prefix="M6N ">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
+      <match key="system.hardware.product" prefix="M5N">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
+      <match key="system.hardware.product" prefix="M7A">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
+    </match>
+    <!-- ASUS a7v600 motherboard, has no usable sys_* entries besides bios_version -->
+    <match key="smbios.bios.version" prefix="ASUS A7V600">
+      <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+      <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
     </match>
   </device>
 </deviceinfo>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 98d2d80..5355f6c 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -22,6 +22,18 @@
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
       </match>
+      <match key="system.hardware.product" prefix="Presario R3200">	
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+      </match>
+      <match key="system.hardware.product" prefix="Pavilion dv4000">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+        <merge key="power_management.quirk.no_fb" type="bool">true</merge>
+      </match>
+      <match key="system.hardware.product" prefix="Pavilion zt3300">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+      </match>
       <match key="system.hardware.product" contains="nx6125">
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         <merge key="power_management.quirk.no_fb" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index b1d5468..659010d 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -10,13 +10,22 @@
   </device>
   <device>
     <match key="system.hardware.vendor" string="Compaq">
-      <match key="system.hardware.product" contains="N620c ">
+      <match key="system.hardware.product" contains="N620c">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
     </match>
   </device>
   <device>
+    <!-- vbe mode does not work, text size changes. -->
+    <match key="system.hardware.vendor" prefix="Compaq ">
+      <match key="system.hardware.product" prefix="Evo N800w">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+      </match>
+    </match>
+  </device>
+  <device>
     <match key="system.hardware.vendor" prefix="LG">
       <match key="system.hardware.product" string="M1-3DGBG">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
@@ -63,4 +72,23 @@
       </match>
     </match>
   </device>
+
+  <device>
+    <match key="system.hardware.vendor" string="AVERATEC">
+      <match key="system.hardware.product" string="3700 Series">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
+    </match>
+  </device>
+
+  <device>
+    <match key="system.hardware.vendor" prefix="BenQ">
+      <match key="system.hardware.product" string="Joybook R22">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
+    </match>
+  </device>
+
 </deviceinfo>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index 079b134..5efe243 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -29,6 +29,13 @@
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" prefix="Satellite M35X">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
+      <match key="system.hardware.product" prefix="TECRA 8200">
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>