]> git.baikalelectronics.ru Git - kernel.git/commit
drm/nv17-50: restore fence buffer on resume
authorMarcin Slusarz <marcin.slusarz@gmail.com>
Tue, 25 Dec 2012 17:13:22 +0000 (18:13 +0100)
committerBen Skeggs <bskeggs@redhat.com>
Sun, 13 Jan 2013 08:07:45 +0000 (18:07 +1000)
commitf2a06948813c4eea891afa0cdd27e773f70db966
treeed2a7bb7dfc91febaa62b926e79714ea71a9a790
parentadd2f0bf356695b94d79d1da6cb78a55d5a0a2d4
drm/nv17-50: restore fence buffer on resume

Since commit 837b5597923d974dbff5053cc2187a2e51062a10 "drm/nouveau/fence:
convert to exec engine, and improve channel sync" nouveau fence sync
implementation for nv17-50 and nvc0+ started to rely on state of fence buffer
left by previous sync operation. But as pinned bo's (where fence state is
stored) are not saved+restored across suspend/resume, we need to do it
manually.

nvc0+ was fixed by commit 5edc105fee89203b225a959001c86dbc1a556260
"drm/nvc0/fence: restore pre-suspend fence buffer context on resume".

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=50121
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/nouveau/nouveau_fence.h
drivers/gpu/drm/nouveau/nv10_fence.c
drivers/gpu/drm/nouveau/nv50_fence.c