hal: Branch 'master'

[David Zeuthen]

 fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree a06e0f8d72a3d1cd0a8ab6a845232db1eb9947b9 (from ae31fad70d51ec94f82252f4814984c0ce7c9ed9)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Thu May 3 13:19:56 2007 -0400

    remove incorrect vbestate_restore quirk for some laptops
    
    Le jeudi 03 mai 2007 à 14:00 +0200, Frederic Crozat a écrit :
    > Le jeudi 03 mai 2007 à 12:28 +0200, Danny Kukawka a écrit :
    > > On Donnerstag, 3. Mai 2007, Frederic Crozat wrote:
    > > > Le jeudi 03 mai 2007 à 11:25 +0200, Frederic Crozat a écrit :
    > > > > Le mercredi 02 mai 2007 à 20:51 +0200, Danny Kukawka a écrit :
    > > [...]
    > > > > > You miss something in the testplan: suspend to ram has also to work
    > > > > > from console. And for your changes (remove vbestate_restore quirk) this
    > > > > > wouldn't work in the most cases! So I would vote against this changes
    > > > > > until this get rechecked with init=/bin/bash (start with
    > > > > > init=/bin/bash, call suspendToRam, resume and check if all work)
    > > > >
    > > > > I don't recall seeing such regressions for console suspend but I'll try
    > > > > to grab one of those problematic laptops.
    > > >
    > > > I just tested one of the laptops. And you were right, restoring for
    > > > framebuffer is broken if vbestate_restore is not used.
    > >
    > > Which one was it?
    >
    > HP nc4200
    >
    > I didn't test the other ones on the list.
    >
    > I've also tested with s2ram just now and the same issue is present.
    >
    > However, after looking at s2ram whitelist recent changes (btw, it would
    > be nice to push all modifications and new additions to hal-info), I
    > tried to replace vbestate_restore with vbemode_restore and both X and
    > console suspend are working fine now.
    >
    > David, could you put this patch on hold until I retest the various
    > laptops listed in my patch ?
    >
    > I'll send a new patch shortly.
    
    Ok, I've tested :
    HP nc4200
    HP nx6125
    DELL 110L
    
    both HP laptops are suspending/resuming fine with vbemode_restore in
    both console and X, so quirk should be changed to vbemode_restore for
    them (I've attached a patch for this).
    
    Dell 110L is not fixable for both console and X at the same time.
    Enabling vbestate_restore crashes X server and it is not able to start
    again correctly without a system reboot. So, for now, it is probably
    best to not change quirks for this laptop, I'll keep a patch in our
    package.
    
    I don't have access anymore to nx6110 nor nc6220 laptops so it is
    probably safe to not change quirks for them either (although I think
    using vbemode instead of vbestate will probably work) for now, I'll keep
    a vendor patch for now. Of course, if somebody has such a laptop, he is
    welcome to report tests :)
    
    So, unless there is objection, it is safe to commit the attached patch
    to hal-info and to forget my proposal for multiple quirks, based on vt
    mode, in a previous mail.
    
    Thanks you.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 4f62a9c..aa64a41 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -23,7 +23,7 @@
         </match>
       </match>
       <match key="system.hardware.product" contains="nx6125">
-        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+        <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         <merge key="power_management.quirk.no_fb" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" contains="nc6230">
@@ -40,7 +40,7 @@
       </match>
       <match key="system.hardware.product" contains="nc4200">
         <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.vbemode_restore" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" contains="nx6110">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>