Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-23 Thread Ingo Molnar
* Matthew Garrett <[EMAIL PROTECTED]> wrote: > We've got i915 suspend/resume now, which already fixes this for a > large number of users. Recent ATI is easy, now that we actually have > specs for ATOM. The nouveau guys are almost at the point where we can > do it for nvidia. That basically jus

Re: i915 hibernation patch (was: Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.)

2008-02-23 Thread Pavel Machek
> > Apart from those issues it looks fine to me. > > OK, please have a look at the modified patch below. Seems to work here after basic tests. ACK. (I discovered that -rc2 swsusp will not power down in some cases, but it was here before the patch, too...)

Re: i915 hibernation patch (was: Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.)

2008-02-22 Thread Jeff Chua
On Sat, Feb 23, 2008 at 10:07 AM, Linus Torvalds <[EMAIL PROTECTED]> wrote: > On Sat, 23 Feb 2008, Rafael J. Wysocki wrote: > > OK, please have a look at the modified patch below. > > All right, I'm fine with it. Now we just need to confirm that it works for > people.. Looks good. Applied Raf

Re: i915 hibernation patch (was: Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.)

2008-02-22 Thread Linus Torvalds
On Sat, 23 Feb 2008, Rafael J. Wysocki wrote: > > In the revised patch below I redefined the PM_EVENT_* things as flags so > that I can "or" them and defined PM_EVENT_SLEEP in analogy with > CONFIG_PM_SLEEP. Ok, looks fine by me. > > Didn't you miss the apci_pci_choose_state() thing that also

Re: i915 hibernation patch (was: Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.)

2008-02-22 Thread Rafael J. Wysocki
On Saturday, 23 of February 2008, Linus Torvalds wrote: > > On Sat, 23 Feb 2008, Rafael J. Wysocki wrote: > > > --- linux-2.6.orig/drivers/char/drm/i915_drv.c > > +++ linux-2.6/drivers/char/drm/i915_drv.c > > @@ -222,6 +222,7 @@ static void i915_restore_vga(struct drm_ > >

Re: i915 hibernation patch (was: Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.)

2008-02-22 Thread Linus Torvalds
On Sat, 23 Feb 2008, Rafael J. Wysocki wrote: > --- linux-2.6.orig/drivers/char/drm/i915_drv.c > +++ linux-2.6/drivers/char/drm/i915_drv.c > @@ -222,6 +222,7 @@ static void i915_restore_vga(struct drm_ > dev_priv->saveGR[0x18]); > > /* Attribute controller regist

i915 hibernation patch (was: Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.)

2008-02-22 Thread Rafael J. Wysocki
On Friday, 22 of February 2008, Jesse Barnes wrote: > On Thursday, February 21, 2008 5:13 pm Jesse Barnes wrote: > > On Thursday, February 21, 2008 4:54 pm Rafael J. Wysocki wrote: > > > On Friday, 22 of February 2008, Linus Torvalds wrote: > > > > On Fri, 22 Feb 2008, Rafael J. Wysocki wrote: > >

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-22 Thread Matthew Garrett
On Fri, Feb 22, 2008 at 02:06:15PM +0100, Ingo Molnar wrote: > btw., why isnt there an in-kernel whitelist, with perhaps a dynamic, > convenient /debug/s2r/whitelist append-API for distros (and testers) to > add more entries to the whitelist/blacklist? (for cases where the kernel > whitelist ha

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-22 Thread Linus Torvalds
On Fri, 22 Feb 2008, Ingo Molnar wrote: > > btw., why isnt there an in-kernel whitelist, with perhaps a dynamic, > convenient /debug/s2r/whitelist append-API for distros (and testers) to > add more entries to the whitelist/blacklist? (for cases where the kernel > whitelist has not caught up y

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-22 Thread Rafael J. Wysocki
On Friday, 22 of February 2008, Ingo Molnar wrote: > > * Matthew Garrett <[EMAIL PROTECTED]> wrote: > > > The s2ram command has a built-in whitelist used to set up video > > rePOSTing. If you want to test, reboot and do > > > > echo mem >/sys/power/state > > > > without i915 being loaded. If y

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-22 Thread Ingo Molnar
* Matthew Garrett <[EMAIL PROTECTED]> wrote: > The s2ram command has a built-in whitelist used to set up video > rePOSTing. If you want to test, reboot and do > > echo mem >/sys/power/state > > without i915 being loaded. If you get a console back on resume then > the platform is reinitialisin

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-22 Thread Matthew Garrett
On Fri, Feb 22, 2008 at 08:42:15AM +0800, Jeff Chua wrote: > On Fri, Feb 22, 2008 at 8:23 AM, Jesse Barnes <[EMAIL PROTECTED]> wrote: > > > Your system (either your distro suspend/resume scripts or your platform) > > must > > be running the video BIOS at resume time, otherwise it would probably

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Jesse Barnes
On Thursday, February 21, 2008 5:28 pm Linus Torvalds wrote: > On Thu, 21 Feb 2008, Jesse Barnes wrote: > > So the advantage of the kernel suspend/resume hooks for the DRM layer is > > that the kernel video drivers can do full state save/restore (which X > > usually doesn't do, and isn't really des

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Jesse Barnes
On Thursday, February 21, 2008 5:13 pm Jesse Barnes wrote: > On Thursday, February 21, 2008 4:54 pm Rafael J. Wysocki wrote: > > On Friday, 22 of February 2008, Linus Torvalds wrote: > > > On Fri, 22 Feb 2008, Rafael J. Wysocki wrote: > > > > - if (state.event == PM_EVENT_SUSPEND) { > > > > +

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Linus Torvalds
On Thu, 21 Feb 2008, Jesse Barnes wrote: > > So the advantage of the kernel suspend/resume hooks for the DRM layer is that > the kernel video drivers can do full state save/restore (which X usually > doesn't do, and isn't really designed to do), so that if your platform > *doesn't* do it all,

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Jeff Chua
On Fri, Feb 22, 2008 at 9:02 AM, Jesse Barnes <[EMAIL PROTECTED]> wrote: > The fact that you'd started running into problems since we merged this just > means your platform was taking care of it for you (lucky you) and that we > have some bugs in the hibernate code that we're just discovering.

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Jesse Barnes
On Thursday, February 21, 2008 4:52 pm Jeff Chua wrote: > On Fri, Feb 22, 2008 at 8:46 AM, Jesse Barnes <[EMAIL PROTECTED]> wrote: > > Your s2ram script is doing your STD also? Seems counterintuitive. > > Anyway, some machines also re-POST the GPU on resume from S3; maybe yours > > is doing tha

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Jesse Barnes
On Thursday, February 21, 2008 4:54 pm Rafael J. Wysocki wrote: > On Friday, 22 of February 2008, Linus Torvalds wrote: > > On Fri, 22 Feb 2008, Rafael J. Wysocki wrote: > > > - if (state.event == PM_EVENT_SUSPEND) { > > > + if (state.event == PM_EVENT_SUSPEND && !in_hibernation_power_off()) { > >

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Rafael J. Wysocki
On Friday, 22 of February 2008, Jeff Chua wrote: > On Fri, Feb 22, 2008 at 8:42 AM, Jeff Chua <[EMAIL PROTECTED]> wrote: > > On Fri, Feb 22, 2008 at 8:31 AM, Rafael J. Wysocki <[EMAIL PROTECTED]> > > wrote: > > > > > Jeff, can you please test hibernation with the patch I've just sent to > > Jes

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Jeff Chua
On Fri, Feb 22, 2008 at 8:42 AM, Jeff Chua <[EMAIL PROTECTED]> wrote: > On Fri, Feb 22, 2008 at 8:31 AM, Rafael J. Wysocki <[EMAIL PROTECTED]> wrote: > > > Jeff, can you please test hibernation with the patch I've just sent to > Jesse > > (reproduced below for convenience)? > > Testing now.

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Rafael J. Wysocki
On Friday, 22 of February 2008, Linus Torvalds wrote: > > On Fri, 22 Feb 2008, Rafael J. Wysocki wrote: > > > > - if (state.event == PM_EVENT_SUSPEND) { > > + if (state.event == PM_EVENT_SUSPEND && !in_hibernation_power_off()) { > > I don't understand why hibernation just doesn't use a PM_E

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Jeff Chua
On Fri, Feb 22, 2008 at 8:46 AM, Jesse Barnes <[EMAIL PROTECTED]> wrote: > Your s2ram script is doing your STD also? Seems counterintuitive. Anyway, > some machines also re-POST the GPU on resume from S3; maybe yours is doing > that. It's s2ram to do STR, not STD. Sorry for the confusion. Bu

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Linus Torvalds
On Fri, 22 Feb 2008, Rafael J. Wysocki wrote: > > - if (state.event == PM_EVENT_SUSPEND) { > + if (state.event == PM_EVENT_SUSPEND && !in_hibernation_power_off()) { I don't understand why hibernation just doesn't use a PM_EVENT_HIBERNATE, and be done with it? Why should it be called

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Jesse Barnes
On Thursday, February 21, 2008 4:42 pm Jeff Chua wrote: > On Fri, Feb 22, 2008 at 8:23 AM, Jesse Barnes <[EMAIL PROTECTED]> wrote: > > Your system (either your distro suspend/resume scripts or your platform) > > must be running the video BIOS at resume time, otherwise it would > > probably come b

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Jeff Chua
On Fri, Feb 22, 2008 at 8:31 AM, Rafael J. Wysocki <[EMAIL PROTECTED]> wrote: > Jeff, can you please test hibernation with the patch I've just sent to Jesse > (reproduced below for convenience)? Testing now. Jeff. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in th

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Jeff Chua
On Fri, Feb 22, 2008 at 8:23 AM, Jesse Barnes <[EMAIL PROTECTED]> wrote: > Your system (either your distro suspend/resume scripts or your platform) must > be running the video BIOS at resume time, otherwise it would probably come > back blank. But I don't think so, unless acpid is doing just t

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Jesse Barnes
On Thursday, February 21, 2008 4:20 pm Jeff Chua wrote: > On Fri, Feb 22, 2008 at 5:02 AM, Jesse Barnes <[EMAIL PROTECTED]> wrote: > > On Thursday, February 21, 2008 11:43 am Romano Giannetti wrote: > > > > > Let's try to narrow it down to what the interaction is. Are you > > > > > using somethi

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Rafael J. Wysocki
On Friday, 22 of February 2008, Jeff Chua wrote: > On Fri, Feb 22, 2008 at 5:02 AM, Jesse Barnes <[EMAIL PROTECTED]> wrote: > > On Thursday, February 21, 2008 11:43 am Romano Giannetti wrote: > > > > > Let's try to narrow it down to what the interaction is. Are you using > > > > > something like

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Jeff Chua
On Fri, Feb 22, 2008 at 5:02 AM, Jesse Barnes <[EMAIL PROTECTED]> wrote: > On Thursday, February 21, 2008 11:43 am Romano Giannetti wrote: > > > > Let's try to narrow it down to what the interaction is. Are you using > > > > something like acpi_sleep=s3_bios or similar? > > > > > > No. Not addi

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Jesse Barnes
On Thursday, February 21, 2008 11:43 am Romano Giannetti wrote: > > > Let's try to narrow it down to what the interaction is. Are you using > > > something like acpi_sleep=s3_bios or similar? > > > > No. Not additional command line option except for resume=/dev/sda3 > > reboot=bios > > My laptop (a

Re: [Suspend-devel] 2.6.25-rc2 System no longer powers off aftersuspend-to-disk. Screen becomes green.

2008-02-21 Thread Romano Giannetti
On Thu, 2008-02-21 at 02:02 +0800, Jeff Chua wrote: > On Feb 21, 2008 1:52 AM, Linus Torvalds <[EMAIL PROTECTED]> wrote: > > > Ahh. You're using the BIOS to re-initialize your video, aren't you? > > I don't know. Just pure simple "s2ram" without any options. Well, as far as I know, s2ram could