hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 3b5aebb4562a88a85b0145d408e448309ec41799
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Nov 9 15:12:14 2007 +0100

    updated suspend quirks for Sony with s2ram commit -r1.115
    
    Updated suspend quirks for Sony with changes in s2ram whitelist from cvs
    commit -r1.115.
    
    Added new:
    - VGN-T250P, VGN-C2S_G, PCG-Z1RMP
    
    Whitelisted:
    - VGN-SZ5XN_C, VGN-TZ21XN_B, PCG-FR215E

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index f5f4df6..f9f31cd 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -2,7 +2,7 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" string="Sony Corporation">
-      <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L">
+      <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
@@ -13,16 +13,22 @@
       <match key="system.hardware.product" string="VGN-FS115Z">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405">
+      <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" string_outof="VGN-TX5MN_W;PCG-TR2A(UC);VGN-UX50">
 	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" contains="PCG-Z1RMP">
+	<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+      </match>
 
       <!-- machines which need no quirks -->
-      <!-- VGN-FE31M: only from X, S3_MODE hangs the machine, all other leave the screen blank -->
-      <match key="system.hardware.product" string_outof="VGN-TX3HP;VGN-B55G(I);VGN-FE31M;VGN-FS215B;VGN-FS660_W">
+      <!-- Note:
+           - VGN-FE31M: only from X, S3_MODE hangs the machine, all other leave the screen blank 
+           - VGN-SZ5XN_C: machine has two gfx cards, works only well with the intel, not with the nvidia -->
+      <match key="system.hardware.product" string_outof="VGN-TX3HP;VGN-B55G(I);VGN-FE31M;VGN-FS215B;VGN-FS660_W;VGN-SZ5XN_C;VGN-TZ21XN_B;PCG-FR215E">
 	<merge key="power_management.quirk.none" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" contains_outof="VGN-TZ11;PCG-F430(UC);PCG-GRT916Z;PCG-GRT995MP;PCG-GR7_K(J) ">