hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 284bc165103ef505d5f5669ed96ed3fe860e30c3
Author: Luca Botti <lbotti at byte-code.com>
Date:   Mon Aug 25 13:51:33 2008 +0200

    fix suspend quirk entry for Dell D630
    
    Fix suspend quirk entry for Dell D630. Since bios version A12 the
    machine needs no longer vbe_post.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 81cd1e3..f08c919 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -31,11 +31,21 @@
           <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" contains_outof="D600;D610;D630">
-          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+	<match key="system.hardware.product" contains_outof="D600;D610">
+          <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_outof="D630">
+	  <match key="system.firmware.version" compare_lt="A12">
+	    <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.firmware.version" compare_ge="A12">
+            <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+	  </match>
+        </match>
         <match key="system.hardware.product" suffix="X1">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>