hal: Branch 'master'

[David Zeuthen]

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

New commits:
diff-tree 272d44f2ae64583483bd1250cec3ff11c679a796 (from a3076bc112efb02e3bbfe2a6800b5563b484bbf7)
Author: Michael Biebl <mbiebl at gmail.com>
Date:   Wed May 2 23:38:58 2007 -0400

    quirk for HP nx7000
    
    My venerable, 3 year old nx7000 laptop needs some workarounds to
    properly suspend/resume.  The attached patch proved to work for
    me. TTBOMK all nx7000 models use a radeon m 9200 chip, so this should
    be safe to add.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 8679d18..fb972a6 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -36,6 +36,10 @@
         <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="nx7000">
+        <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="nx8220">
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         <merge key="power_management.quirk.no_fb" type="bool">true</merge>