https://bugzilla.kernel.org/show_bug.cgi?id=39422
Summary: s2ram with nouveau leaves VTs blank, works in X (but only for vt X was running on) Product: Drivers Version: 2.5 Kernel Version: 3.0.0-rc6 Platform: All OS/Version: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Video(DRI - non Intel) AssignedTo: drivers_video-dri@kernel-bugs.osdl.org ReportedBy: randrik@mail.ru Regression: No
Hello.
I've tested both mainline and http://cgit.freedesktop.org/nouveau/linux-2.6/
mainline - commit fe0d42203cb5616eeff68b14576a0f7e2dd56625 ("Linux 3.0-rc6") nouveau-2.6 - commit 72690683e35680d912e9b8ff2ee0b7a18631dd0d ("drm/nouveau/pm: Document and expose CL and WR for 0x1002Cx")
doing echo mem > /sys/power/sleep send my system to sleep, but on resume i can see only blank vt, if i run this command from console. I can poweroff machine via ctrl-alt-del, or power button. If I start X, and suspend from xterminal - on restore i can see X again, and work as usual, but non-X VTs still blank (with small line-shaped cursor in top-left corner).
https://bugzilla.kernel.org/show_bug.cgi?id=39422
--- Comment #1 from Andrew Randrianasulu randrik@mail.ru 2011-07-15 16:00:18 --- Created an attachment (id=65742) --> (https://bugzilla.kernel.org/attachment.cgi?id=65742) lspci -vv
https://bugzilla.kernel.org/show_bug.cgi?id=39422
--- Comment #2 from Andrew Randrianasulu randrik@mail.ru 2011-07-15 16:01:50 --- Created an attachment (id=65752) --> (https://bugzilla.kernel.org/attachment.cgi?id=65752) dmesg
from nouveau tree, without attempt to suspend
https://bugzilla.kernel.org/show_bug.cgi?id=39422
--- Comment #3 from Andrew Randrianasulu randrik@mail.ru 2011-07-15 16:04:08 --- Created an attachment (id=65762) --> (https://bugzilla.kernel.org/attachment.cgi?id=65762) dmesg after s2ram
https://bugzilla.kernel.org/show_bug.cgi?id=39422
Andrew Randrianasulu randrik@mail.ru changed:
What |Removed |Added ---------------------------------------------------------------------------- Platform|All |i386
https://bugzilla.kernel.org/show_bug.cgi?id=39422
--- Comment #4 from Marcin Slusarz marcin.slusarz@gmail.com 2011-07-15 21:23:10 --- Created an attachment (id=65782) --> (https://bugzilla.kernel.org/attachment.cgi?id=65782) test patch
It seems M2MF object is bounded to NV04_GDI subchannel after resume.
Can you test attached patch?
--- Comment #5 from Andrew Randrianasulu randrik@mail.ru 2011-07-16 06:15:08 --- (In reply to comment #4)
Created an attachment (id=65782)
--> (https://bugzilla.kernel.org/attachment.cgi?id=65782) [details]
test patch
It seems M2MF object is bounded to NV04_GDI subchannel after resume.
Can you test attached patch?
Works (tried 2 suspends , one from console, one from X) Thanks a lot!
https://bugzilla.kernel.org/show_bug.cgi?id=39422
--- Comment #6 from Marcin Slusarz marcin.slusarz@gmail.com 2011-07-17 18:06:38 --- Created an attachment (id=65882) --> (https://bugzilla.kernel.org/attachment.cgi?id=65882) fix
Can you check this patch instead?
https://bugzilla.kernel.org/show_bug.cgi?id=39422
--- Comment #7 from Andrew Randrianasulu randrik@mail.ru 2011-07-17 19:01:33 --- (In reply to comment #6)
Created an attachment (id=65882)
--> (https://bugzilla.kernel.org/attachment.cgi?id=65882) [details]
fix
Can you check this patch instea(In reply to comment #6) Created an attachment (id=65882)
--> (https://bugzilla.kernel.org/attachment.cgi?id=65882) [details]
fix
Can you check this patch instead?
Patch doesn't apply to master (commit 1765a367a3b5d5e9692949b0c5ec933eff2c0701, "Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6")
git apply ../nouveau-kernel/linux-2.6/0001-drm-nouveau-restore-subchannel-object-binding-on-res.patch error: patch failed: drivers/gpu/drm/nouveau/nouveau_drv.h:302 error: drivers/gpu/drm/nouveau/nouveau_drv.h: patch does not apply error: patch failed: drivers/gpu/drm/nouveau/nvc0_fbcon.c:200 error: drivers/gpu/drm/nouveau/nvc0_fbcon.c: patch does not apply
nor to nouveau-2.6 (commit 72690683e35680d912e9b8ff2ee0b7a18631dd0d)
git apply 0001-drm-nouveau-restore-subchannel-object-binding-on-res.patch -v Checking patch drivers/gpu/drm/nouveau/nouveau_dma.c... Checking patch drivers/gpu/drm/nouveau/nouveau_dma.h... Checking patch drivers/gpu/drm/nouveau/nouveau_drv.c... Checking patch drivers/gpu/drm/nouveau/nouveau_drv.h... error: while searching for: struct list_head flip; } nvsw;
#ifdef CONFIG_DRM_NOUVEAU_DEBUG struct { bool active;
error: patch failed: drivers/gpu/drm/nouveau/nouveau_drv.h:302 error: drivers/gpu/drm/nouveau/nouveau_drv.h: patch does not apply Checking patch drivers/gpu/drm/nouveau/nouveau_fence.c... Checking patch drivers/gpu/drm/nouveau/nv04_fbcon.c... Checking patch drivers/gpu/drm/nouveau/nv50_fbcon.c... Checking patch drivers/gpu/drm/nouveau/nvc0_fbcon.c...
https://bugzilla.kernel.org/show_bug.cgi?id=39422
Marcin Slusarz marcin.slusarz@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Attachment #65882|0 |1 is obsolete| |
--- Comment #8 from Marcin Slusarz marcin.slusarz@gmail.com 2011-07-17 19:46:30 --- Created an attachment (id=65892) --> (https://bugzilla.kernel.org/attachment.cgi?id=65892) fix v2
I had some local modifications. This one applies to both trees
https://bugzilla.kernel.org/show_bug.cgi?id=39422
--- Comment #9 from Andrew Randrianasulu randrik@mail.ru 2011-07-17 20:57:03 --- (In reply to comment #8)
Created an attachment (id=65892)
--> (https://bugzilla.kernel.org/attachment.cgi?id=65892) [details]
fix v2
I had some local modifications. This one applies to both trees
This one works too
https://bugzilla.kernel.org/show_bug.cgi?id=39422
Florian Mickler florian@mickler.org changed:
What |Removed |Added ---------------------------------------------------------------------------- CC| |florian@mickler.org
--- Comment #10 from Florian Mickler florian@mickler.org 2011-08-08 14:13:13 --- A patch referencing this bug report has been merged in Linux v3.1-rc1:
commit 12a30e267c162145df3c104d0f4aabff7bce56a5 Author: Ben Skeggs bskeggs@redhat.com Date: Mon Jul 18 09:56:36 2011 +1000
drm/nv40/gr: rewrite/split context takedown functions
https://bugzilla.kernel.org/show_bug.cgi?id=39422
Andrew Randrianasulu randrik@mail.ru changed:
What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |CODE_FIX
--- Comment #11 from Andrew Randrianasulu randrik@mail.ru 2011-08-28 10:35:41 --- Fixed in 3.1.0-rc3+.
Thanks!
dri-devel@lists.freedesktop.org