hal: Branch 'origin' - 8 commits
David Zeuthen
david at kemper.freedesktop.org
Wed May 23 10:07:49 PDT 2007
Makefile.am | 25 +++++++-------
VERSION | 2 -
fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi | 3 +
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 8 +++-
fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi | 13 ++++++-
5 files changed, 36 insertions(+), 15 deletions(-)
New commits:
diff-tree f4b7cdba4aeefca32c59532c3ec14249a778db9a (from 4f6397a058e5185414be0611c4c783bbc1a845c2)
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed May 23 17:33:46 2007 +0100
fix dell d620 video quirk
>Fixes resume for me (in X anyway), console is still blank after resume
(haven't gotten that to work with any combination of quirks yet).
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 5f04f9b..e0c1a9b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -18,6 +18,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="D620">
+ <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>
diff-tree 4f6397a058e5185414be0611c4c783bbc1a845c2 (from 7ceb104ef66ce25fa5abf8e28b591dfc343422ce)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date: Wed May 23 16:22:52 2007 +0100
Fix quirk for IBM T43
IBM Thinkpad T43/2668 updated quirks (console, X with fglrx and r300 drivers)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index fb45ac5..f2cffde 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -45,8 +45,8 @@
<!-- T43 -->
<match key="system.hardware.product" prefix="2668">
<match key="system.hardware.version" string="ThinkPad T43">
- <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
- <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
</match>
<match key="system.hardware.product" prefix="1871">
diff-tree 7ceb104ef66ce25fa5abf8e28b591dfc343422ce (from 06dd62dae677cab73854bf30af4d36365fccd7ec)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date: Wed May 23 15:03:11 2007 +0100
fix quirk for dell d420 laptop
Comment vbestate-restore quirk for D420 laptop :
- only needed with 1.x i810 driver
- prevent resume when using 2.x intel driver
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index aa03ad6..5f04f9b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -9,7 +9,9 @@
</match>
<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>
+ <!-- ONLY needed with i810 X.org driver 1.x versions,
+ DO NOT use with intel X.org driver 2.x version (not needed and causes problems)
+ <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>
diff-tree 06dd62dae677cab73854bf30af4d36365fccd7ec (from 79fdf06d035318c2c725275bbb4b5b3d32355ca3)
Author: Richard Hughes <richard at hughsie.com>
Date: Tue May 22 16:10:57 2007 +0100
Enable s3_bios for the Thinkpad X41.
Enable s3_bios for the Thinkpad X41. Patch from Zack Cerza <zcerza at redhat.com>.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 326ea54..fb45ac5 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -29,6 +29,10 @@
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
+ <!-- X41 -->
+ <match key="system.hardware.product" prefix="2525">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ </match>
<!-- T41p -->
<match key="system.hardware.product" prefix="2373">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
diff-tree 79fdf06d035318c2c725275bbb4b5b3d32355ca3 (from 0133c683d606a17c274495700a91a2d4219bbf7f)
Author: Richard Hughes <richard at hughsie.com>
Date: Tue May 22 15:36:36 2007 +0100
adds3_{bios,mode} quirks for IBM ThinkPad T43.
Add a trivial patch to enable the s3_{bios,mode} quirks for my ThinkPad
T43. Patch by Luke Macken <lmacken at redhat.com>.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index e368e54..326ea54 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -38,13 +38,20 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <!-- G40 -->
+ <!-- T43 -->
<match key="system.hardware.product" prefix="2668">
<match key="system.hardware.version" string="ThinkPad T43">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
+ <match key="system.hardware.product" prefix="1871">
+ <match key="system.hardware.version" string="ThinkPad T43">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
+ </match>
+ <!-- G40 -->
<match key="system.hardware.product" prefix="2388">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
diff-tree 0133c683d606a17c274495700a91a2d4219bbf7f (from 28bfbaaebc0f234589e349e5180c1774d1f24921)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed May 16 17:04:37 2007 -0700
version 20070516
diff --git a/VERSION b/VERSION
index 2a1e6b6..735a63f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20070425
+20070516
diff-tree 28bfbaaebc0f234589e349e5180c1774d1f24921 (from a9a768e0e041d4c5cd149142451561beea52b148)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed May 16 16:57:40 2007 -0700
add quirks for 1st generation Macbook Pro
Verified on my own hardware. Yay, my Macbook Pro now suspends and resumes
correctly!
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
index 4fc3036..55ee006 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
@@ -2,6 +2,9 @@
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" prefix="Apple">
+ <match key="system.hardware.product" string="MacBookPro1,1">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ </match>
<match key="system.hardware.product" string="MacBook1,1">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
diff-tree a9a768e0e041d4c5cd149142451561beea52b148 (from 4e2263d31ede8eda833a23b4fe2fcc876eb65daf)
Author: David Zeuthen <davidz at redhat.com>
Date: Wed May 16 16:55:28 2007 -0700
remove the "sending mail" part of the release target
diff --git a/Makefile.am b/Makefile.am
index 9f2facb..5450dd6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,18 +50,19 @@ release-real:
@git-push
@git-tag -m "version `cat VERSION`" -s HAL_INFO_`cat VERSION`
@git-push --tags
- @echo "From: $(GIT_AUTHOR_NAME) <$(GIT_AUTHOR_EMAIL)>" > .release-mail
- @echo "To: hal at lists.freedesktop.org" >> .release-mail
- @echo "Subject: hal-info `cat VERSION` release" >> .release-mail
- @echo "X-Mailer: hal-info release script" >> .release-mail
- @echo "" >> .release-mail
- @echo "There's a new hal-info `cat VERSION` release available. Download from" >> .release-mail
- @echo "" >> .release-mail
- @echo " http://people.freedesktop.org/~david/dist/hal-info-`cat VERSION`.tar.gz" >> .release-mail
- @echo "" >> .release-mail
- @echo "." >> .release-mail
- @echo "" >> .release-mail
- @cat .release-mail | $(MAIL) davidz at redhat.com hal at lists.freedesktop.org
+
+# @echo "From: $(GIT_AUTHOR_NAME) <$(GIT_AUTHOR_EMAIL)>" > .release-mail
+# @echo "To: hal at lists.freedesktop.org" >> .release-mail
+# @echo "Subject: hal-info `cat VERSION` release" >> .release-mail
+# @echo "X-Mailer: hal-info release script" >> .release-mail
+# @echo "" >> .release-mail
+# @echo "There's a new hal-info `cat VERSION` release available. Download from" >> .release-mail
+# @echo "" >> .release-mail
+# @echo " http://people.freedesktop.org/~david/dist/hal-info-`cat VERSION`.tar.gz" >> .release-mail
+# @echo "" >> .release-mail
+# @echo "." >> .release-mail
+# @echo "" >> .release-mail
+# @cat .release-mail | $(MAIL) davidz at redhat.com hal at lists.freedesktop.org
More information about the hal-commit
mailing list