hal: Branch 'origin' - 10 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Fri May 4 04:52:01 PDT 2007
fdi/information/10freedesktop/10-usb-card-readers.fdi | 18
fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi | 20
fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi | 8
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 102 ----
fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi | 16
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 50 --
fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi | 264 ------------
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 4
fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi | 27 -
fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi | 4
fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi | 32 -
11 files changed, 36 insertions(+), 509 deletions(-)
New commits:
diff-tree bbcd5e8032230d290b21ef5b5a5fdb02762b46b2 (from a06e0f8d72a3d1cd0a8ab6a845232db1eb9947b9)
Author: Richard Hughes <hughsient at gmail.com>
Date: Thu May 3 16:39:05 2007 -0400
remove quirks marked in s2ram as UNSURE
This should take care of e.g.
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=238792
where our quirks actually *prevented* a laptop from resuming.
> Attached is a patch that removes all the UNSURE (i.e. not tested in
> s2ram) entries from hal-info. The last thing we want to do is break
> setups that already work, so I think this is the safest way to go
> forward.
Bahh. Or one that applies. Git is too complicated for my little brain.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 5c225f6..739c54f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -14,14 +14,6 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains="290">
- <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="660">
- <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="650">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
@@ -30,20 +22,8 @@
<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="8100">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
</match>
<match key="system.hardware.product" prefix="Aspire">
- <match key="system.hardware.product" contains="2000">
- <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="3000">
- <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="1690">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 881a7df..79a6627 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -9,10 +9,6 @@
<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" string="L7000G">
- <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" prefix="M6Ne">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
@@ -20,10 +16,6 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix="W5A">
- <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" string="V6V">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index da3e2a3..aa03ad6 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -16,26 +16,6 @@
<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="110L">
- <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="D510">
- <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="D810">
- <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="X1">
- <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="X300">
- <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="D800">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
@@ -50,34 +30,6 @@
</match>
</match>
<match key="system.hardware.product" prefix="Inspiron">
- <match key="system.hardware.product" contains="700m">
- <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="1200">
- <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="6000">
- <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="8100">
- <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="8200">
- <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="8600">
- <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="9300">
- <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="5150">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
@@ -87,10 +39,6 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
- <match key="system.hardware.product" contains="Precision M20">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
</match>
</device>
</deviceinfo>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index c2ee4a3..2bb7f89 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -2,27 +2,11 @@
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" prefix="FUJITSU">
- <match key="system.hardware.product" prefix="Amilo M">
- <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" prefix="Amilo A7640">
<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.s3_bios" type="bool">true</merge>
</match>
- <match key="system.hardware.product" string="LifeBook S Series">
- <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" string="LIFEBOOK S6120">
- <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" string="LIFEBOOK P7010">
- <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" string="Stylistic ST5000">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index aa64a41..98d2d80 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -38,46 +38,6 @@
<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="nc4200">
- <merge key="power_management.quirk.vbe_post" 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>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" contains="nc6120">
- <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="nc6220">
- <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="nc8230">
- <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="dv1000">
- <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="zt3000">
- <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="zd7000">
- <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="Tx1100">
- <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="TR1105">
- <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="R4100">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 9e43d86..e368e54 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -53,270 +53,6 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <match key="system.hardware.product" prefix="2682">
- <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" prefix="2683">
- <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" prefix="2692">
- <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" prefix="2693">
- <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" prefix="2696">
- <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" prefix="2698">
- <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" prefix="2699">
- <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" prefix="2723">
- <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" prefix="2724">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <!-- R50/p -->
- <match key="system.hardware.product" prefix="2897">
- <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" prefix="1829">
- <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" prefix="1830">
- <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" prefix="1831">
- <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" prefix="1832">
- <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" prefix="1833">
- <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" prefix="1836">
- <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" prefix="1840">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <!-- R50e needs not yet implemented save_video_pci_state -->
- <match key="system.hardware.product" prefix="1841">
- <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" prefix="1846">
- <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" prefix="1847">
- <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" prefix="1848">
- <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" prefix="1849">
- <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" prefix="1850">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <!-- T21 -->
- <match key="system.hardware.product" prefix="1870">
- <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" prefix="2647">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <!-- T23 -->
- <match key="system.hardware.product" prefix="2648">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <!-- T40/T41/T42/p -->
- <match key="system.hardware.product" prefix="475S">
- <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" prefix="2375">
- <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" prefix="2376">
- <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" prefix="2378">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <!-- T43 -->
- <match key="system.hardware.product" prefix="2379">
- <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" prefix="1871">
- <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" prefix="1872">
- <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" prefix="1873">
- <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" prefix="1874">
- <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" prefix="1875">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <!-- T43/p -->
- <match key="system.hardware.product" prefix="1876">
- <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" prefix="2668">
- <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" prefix="2669">
- <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" prefix="2678">
- <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" prefix="2679">
- <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" prefix="2686">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <!-- X30 -->
- <match key="system.hardware.product" prefix="2687">
- <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" prefix="2673">
- <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.radeon_off" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" prefix="2884">
- <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.radeon_off" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" prefix="2885">
- <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.radeon_off" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" prefix="2890">
- <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.radeon_off" type="bool">true</merge>
- </match>
- <!-- X40 -->
- <match key="system.hardware.product" prefix="2891">
- <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.radeon_off" type="bool">true</merge>
- </match>
- <match key="system.hardware.product" prefix="2369">
- <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" prefix="2370">
- <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" prefix="2372">
- <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" prefix="2382">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <!-- X41 -->
- <match key="system.hardware.product" prefix="2386">
- <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" prefix="1864">
- <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" prefix="1865">
- <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" prefix="2525">
- <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" prefix="2526">
- <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" prefix="2527">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- <!-- X41 Tablet -->
- <match key="system.hardware.product" prefix="2528">
- <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" prefix="1866">
- <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" prefix="1867">
- <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" prefix="1869">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
</match>
</device>
</deviceinfo>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index efe3896..b1d5468 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -56,31 +56,11 @@
</match>
</device>
<device>
- <match key="system.hardware.vendor" string="ECS">
- <match key="system.hardware.product" contains="G556 Centrino">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- </match>
- </device>
- <device>
<match key="system.hardware.vendor" prefix="Samsung">
- <match key="system.hardware.product" contains="NX05S">
- <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" string="SX20S">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
</device>
- <device>
- <match key="system.hardware.vendor" prefix="SHARP">
- <match key="system.hardware.product" contains="PC-MM20 Series">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- </match>
- </device>
</deviceinfo>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index 663a7c0..8e04237 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -9,10 +9,6 @@
<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" prefix="PCG-U101">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
</match>
</device>
</deviceinfo>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index d1a2958..079b134 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -17,14 +17,6 @@
<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" prefix="Satellite 1900">
- <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" prefix="libretto U100">
- <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" prefix="P2000">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
@@ -37,30 +29,6 @@
<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" prefix="PORTEGE A200">
- <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" prefix="PORTEGE M200">
- <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" prefix="PORTEGE R200">
- <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" prefix="TECRA A2">
- <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" prefix="TECRA A5">
- <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" prefix="TECRA M2">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
</match>
</device>
</deviceinfo>
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>
diff-tree ae31fad70d51ec94f82252f4814984c0ce7c9ed9 (from 82f613a96e20a94eb2d174b2baac7bde64df828f)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date: Wed May 2 23:58:44 2007 -0400
add noname usb card reader
Following patch adds lun matching for a noname usb card reader.
diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index aa4e00c..b0fb54c 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -89,6 +89,24 @@
</match>
<match key="storage.model" string="IC1210 MMC/SD">
<merge key="storage.drive_type" type="string">sd_mmc</merge>
+</match>
+
+ <!-- Noname multi-card Reader -->
+ <match key="@storage.physical_device:usb.vendor_id" int="0x05e3">
+ <match key="@storage.physical_device:usb.product_id" int="0x0760">
+ <match key="storage.lun" int="0">
+ <merge key="storage.drive_type" type="string">compact_flash</merge>
+ </match>
+ <match key="storage.lun" int="1">
+ <merge key="storage.drive_type" type="string">memory_stick</merge>
+ </match>
+ <match key="storage.lun" int="2">
+ <merge key="storage.drive_type" type="string">sd_mmc</merge>
+ </match>
+ <match key="storage.lun" int="3">
+ <merge key="storage.drive_type" type="string">smart_media</merge>
+ </match>
+ </match>
</match>
<!-- Lexar CF Reader -->
diff-tree 82f613a96e20a94eb2d174b2baac7bde64df828f (from da67100940c9171124367e0c620498a694e90de9)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date: Wed May 2 23:57:31 2007 -0400
add quirk for Dell D420
Even if Bastien has already submitted a similar patch, I prefer to post
our patch too, just to be sure I don't forget to send all our patches
here :)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 441f7d6..da3e2a3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -3,16 +3,20 @@
<device>
<match key="system.hardware.vendor" prefix="Dell">
<match key="system.hardware.product" prefix="Latitude">
- <match key="system.hardware.product" contains="D610">
+ <match key="system.hardware.product" contains="D410">
<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="110L">
+ <match key="system.hardware.product" contains="D420">
<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="D410">
+ <match key="system.hardware.product" contains="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="110L">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
diff-tree da67100940c9171124367e0c620498a694e90de9 (from 036b57bbb0887096d626119e925207389a2fa9b3)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date: Wed May 2 23:47:59 2007 -0400
add quirk for Maxdata 6100
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index d10081b..efe3896 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -25,6 +25,13 @@
</match>
</device>
<device>
+ <match key="system.hardware.vendor" contains="MAXDATA">
+ <match key="system.hardware.product" contains="Pro 6100X">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ </match>
+ </match>
+ </device>
+ <device>
<match key="system.hardware.vendor" contains="Matsushita">
<match key="system.hardware.product" contains="CF-51E">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
diff-tree 036b57bbb0887096d626119e925207389a2fa9b3 (from dc3049d260cccc02305ccda42e01bd93fcb204dd)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date: Wed May 2 23:46:48 2007 -0400
add quirk for Lenovo Thinkpad Z61m
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 2dac02e..5fb237f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -31,6 +31,10 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+ <match key="system.hardware.version" string="ThinkPad Z61m">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
</match>
</device>
</deviceinfo>
diff-tree dc3049d260cccc02305ccda42e01bd93fcb204dd (from a125958c38efdeedc553f1087e2ec26aa6b9d1e7)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed May 2 23:44:29 2007 -0400
add back quirk for Dell D410
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 39556d4..441f7d6 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -12,6 +12,10 @@
<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="D410">
+ <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="D510">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
diff-tree a125958c38efdeedc553f1087e2ec26aa6b9d1e7 (from 272d44f2ae64583483bd1250cec3ff11c679a796)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date: Wed May 2 23:44:05 2007 -0400
remove duplicate quirks
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 9c035c9..39556d4 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -28,26 +28,6 @@
<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="110L">
- <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="D410">
- <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="D510">
- <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="D810">
- <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="X300">
- <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="D800">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
@@ -90,34 +70,6 @@
<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="700m">
- <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="1200">
- <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="6000">
- <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="8100">
- <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="8200">
- <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="8600">
- <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="9300">
- <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="5150">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index fb972a6..4f62a9c 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -16,12 +16,6 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
- <match key="system.hardware.product" contains="nx5000">
- <match key="system.firmware.version" prefix="68BCU">
- <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- </match>
- </match>
<match key="system.hardware.product" contains="nc6000">
<match key="system.firmware.version" prefix="68BDD">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
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>
diff-tree a3076bc112efb02e3bbfe2a6800b5563b484bbf7 (from 1ef339dd996b1c1fd62d8746068c974bf8f006c8)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed May 2 23:29:28 2007 -0400
remove duplicate quirk for Dell D410
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index f6e3641..9c035c9 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -3,10 +3,6 @@
<device>
<match key="system.hardware.vendor" prefix="Dell">
<match key="system.hardware.product" prefix="Latitude">
- <match key="system.hardware.product" contains="D410">
- <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="D610">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
More information about the hal-commit
mailing list