2009/11/12 Matthew Garrett <mj...@srcf.ucam.org>:
> On Thu, Nov 12, 2009 at 06:36:13PM +0100, Michael Biebl wrote:
>
>> Hm, my bad then.
>> I have to say that I tested to boot a system with i915.modesetting=0
>> and afaicr there was no
>> /sys/module/i915 directory then, so have_smart_intel wouldn't trigger
>> anyway, what gives?
>
> There should be, unless your init scripts refuse to load i915 if there's
> no modesetting enabled.
My fault. The module parameter is called modeset not modesetting. I
passed this option on the boot prompt which caused the i915 not be
loaded.
I checked for the /sys/module/i915 directory but not if i915 is actually loaded
Sorry for the mess :-/
Attached is a patch which reverts this part from
504faf0a0c31cbdbc03a608cf633d58f12e49eb7.
@Matthew, is this comment still true?
# currently, intel kernel modesetting is not quite smart enough
# we still need acpi s3 kernel modesetting hooks, so don't remove those
# options if they were passed.
@Victor, if Matthew is ok with the above patch, could you please apply
it and spin a 1.2.6.1 release, please.
Thanks,
Michael
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
From dfcb621be50e55b311c2c39d2e1fe32063583c8d Mon Sep 17 00:00:00 2001
From: Michael Biebl <mbi...@gmail.com>
Date: Thu, 12 Nov 2009 22:05:06 +0100
Subject: [PATCH] Add back have_smart_intel
We still need to consider the case where i915 is used with modesetting
disabled. So revert the have_smart_intel removal in
504faf0a0c31cbdbc03a608cf633d58f12e49eb7.
---
pm/sleep.d/98smart-kernel-video | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/pm/sleep.d/98smart-kernel-video b/pm/sleep.d/98smart-kernel-video
index 11b5490..c693dbe 100755
--- a/pm/sleep.d/98smart-kernel-video
+++ b/pm/sleep.d/98smart-kernel-video
@@ -54,9 +54,30 @@ have_fglrx()
remove_all_video_quirks
}
+have_smart_intel()
+{
+ # currently, intel kernel modesetting is not quite smart enough
+ # we still need acpi s3 kernel modesetting hooks, so don't remove those
+ # options if they were passed.
+ [ -d /sys/module/i915 ] || return 1
+ local kernel_rev="$(uname -r |awk -F '[_-]' '{print $1}')"
+ [ "$kernel_rev" \> "2.6.26" -o "$kernel_rev" = "2.6.26" ] || return 1
+ remove_parameters --quirk-dpms-on \
+ --quirk-dpms-suspend \
+ --quirk-vbe-post \
+ --quirk-vbe-post \
+ --quirk-vga-mode3 \
+ --quirk-vbemode-restore \
+ --quirk-vbestate-restore \
+ --quirk-reset-brightness \
+ --quirk-radeon-off \
+ --quirk-no-fb \
+ --quirk-pci-save
+}
+
smart_kernel_video()
{
- have_kms || have_nvidia || have_fglrx || return $NA
+ have_kms || have_nvidia || have_fglrx || have_smart_intel || return $NA
}
case $1 in
--
1.6.5.2
_______________________________________________
Pm-utils mailing list
Pm-utils@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pm-utils
