hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit b0edaf5354561f9a6b914d2e6d04f275b8f4abdd
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Nov 9 11:41:35 2007 +0100

    updated Dell suspend quirks with some entries from s2ram whitelist
    
    Updated Dell suspend quirks with some entries from s2ram whitelist.
    
    Added new:
    - Inspiron: 500m, 510m, 5100
    - Precision: M60
    - Dimension: 2400; 3000
    Whitelisted (no quirk needed):
    - Latitude: CPx J650GT
    - Inspiron: 1150
    - Precision: M90
    - OptiPlex GX520 (desktop with intel)

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 68cbbc5..2eca9e1 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -42,10 +42,23 @@
         <match key="system.hardware.product" suffix="X1">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
+        <!-- these need no quirks -->
+        <match key="system.hardware.product" contains="CPx J650GT">
+          <merge key="power_management.quirk.none" type="bool">true</merge>
+        </match>
       </match>
 
       <!-- Dell Inspiron -->
       <match key="system.hardware.product" prefix="Inspiron">
+        <match key="system.hardware.product" contains=" 500m">
+          <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        </match>
+        <match key="system.hardware.product" contains=" 510m ">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        </match>
+        <match key="system.hardware.product" contains=" 5100 ">
+          <merge key="power_management.quirk.no_fb" type="bool">true</merge>
+        </match>
         <match key="system.hardware.product" contains_outof="1420;5150;8000;8500">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
@@ -68,14 +81,37 @@
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
+        <!-- these need no quirks -->
+        <match key="system.hardware.product" contains=" 1150">
+          <merge key="power_management.quirk.none" type="bool">true</merge>
+        </match>
       </match>
 
+      <!-- Dell Precision -->
+      <match key="system.hardware.product" prefix="Precision">
+        <match key="system.hardware.product" contains=" M60">
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+        </match>
+        <!-- these need no quirks -->
+        <match key="system.hardware.product" contains=" M90 ">
+          <merge key="power_management.quirk.none" type="bool">true</merge>
+        </match>
+      </match>
+	
+      <!-- Dell Dimension -->
+      <match key="system.hardware.product" prefix="Dimension">
+        <match key="system.hardware.product" contains_outof="2400;3000">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+        </match>
+      </match>
+      
       <!-- Dell Inspiron 640m, XPS M1210 -->
       <match key="system.hardware.product" contains_outof="MXC061;MXC062">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
       </match>
-      <!-- Dell XPS M1330 -->
-      <match key="system.hardware.product" string="XPS M1330">
+      <!-- Dell XPS M1330, OptiPlex GX520 (desktop with intel) -->
+      <match key="system.hardware.product" contains_outof="XPS M1330;OptiPlex GX520">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>