hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi |   57 ++++++++++------
 1 file changed, 38 insertions(+), 19 deletions(-)

New commits:
commit b64ef1c6698f6f7784a103f5c7439b8b077829b4
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Oct 26 17:35:57 2007 +0200

    updated quirks for IBM  machines with entries from the s2ram whitelist
    
    Updated quirks for IBM machines with entries from the s2ram whitelist.
    Cleaned up the list and added some new machines.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 87a1dd1..cc84e9a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -2,35 +2,49 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" string="IBM">
-      <match key="system.hardware.version" string="ThinkPad X32">
-        <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
+
+      <match key="system.hardware.version" string="ThinkPad R51">
+        <merge key="power_management.quirk.none" type="bool">true</merge>
+      </match>
+      <match key="system.hardware.version" string="ThinkPad R51e">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <!-- X31 -->
-      <match key="system.hardware.product" prefix="2366">
+
+      <!-- 600e -->
+      <match key="system.hardware.product" prefix="2645">
+	<match key="system.firmware.version" string="INET17WW">      
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+        </match>
+	<match key="system.firmware.version" contains_not="INET17WW">      
+	  <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+        </match>
+      </match>
+
+      <!-- X31, T30 , A31p-->
+      <match key="system.hardware.product" prefix_outof="2366;2653">
         <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
       </match>
-      <!-- X40 -->
-      <match key="system.hardware.product" prefix="2672">
-	<merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
+      <!-- X22, X40; X32 -->
+      <match key="system.hardware.product" prefix_outof="2662;2672;2673">
+        <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
-        <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
       </match>
-      <!-- X40 -->
-      <match key="system.hardware.product" prefix="2371">
-        <match key="system.hardware.version" string="ThinkPad X40">
-          <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
-          <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      <!-- X31 -->
+      <match key="system.hardware.product" prefix="2672">
+        <match key="system.hardware.version" contains="X31">
+          <merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
+          <!-- already added above
+            <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+            <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+            <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
+	  -->
         </match>
       </match>
-      <!-- X41 -->
-      <match key="system.hardware.product" prefix="2525">
-        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
-      </match>
-      <!-- T30, T41p, T41p, Z60t, Z60m -->
-      <match key="system.hardware.product" prefix_outof="1860;2373;2374;2513;2529">
+      <!-- R52, X41t, X40, T30, T41p, T41p, T42, X40, Z60t, X41, Z60m -->
+      <match key="system.hardware.product" prefix_outof="1860;1869;2371;2373;2374;2376;2386;2513;2525;2529">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
@@ -57,6 +71,11 @@
       <match key="system.hardware.product" prefix="2388">
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
       </match>
+      <!-- need no quirks: A21m, A21p, R32, R40 (2x)-->
+      <match key="system.hardware.product" prefix_outof="2628;2629;2658;2681;2722">
+        <merge key="power_management.quirk.none" type="bool">true</merge>
+      </match>
+      
     </match>
   </device>
 </deviceinfo>