Pierre Moreau
2015-Jan-17 01:01 UTC
[Nouveau] [PATCH] nouveau: move conditional suspend messages into conditionals
Signed-off-by: Pierre Moreau <pierre.morrow at free.fr> --- drm/nouveau_drm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drm/nouveau_drm.c b/drm/nouveau_drm.c index 65910e3..9eb90a6 100644 --- a/drm/nouveau_drm.c +++ b/drm/nouveau_drm.c @@ -562,21 +562,22 @@ nouveau_do_suspend(struct drm_device *dev, bool runtime) NV_INFO(drm, "evicting buffers...\n"); ttm_bo_evict_mm(&drm->ttm.bdev, TTM_PL_VRAM); - NV_INFO(drm, "waiting for kernel channels to go idle...\n"); if (drm->cechan) { + NV_INFO(drm, "waiting for cechan to go idle...\n"); ret = nouveau_channel_idle(drm->cechan); if (ret) goto fail_display; } if (drm->channel) { + NV_INFO(drm, "waiting for kernel channel to go idle...\n"); ret = nouveau_channel_idle(drm->channel); if (ret) goto fail_display; } - NV_INFO(drm, "suspending client object trees...\n"); if (drm->fence && nouveau_fence(drm)->suspend) { + NV_INFO(drm, "suspending client object trees...\n"); if (!nouveau_fence(drm)->suspend(drm)) { ret = -ENOMEM; goto fail_display; -- 2.2.2
Possibly Parallel Threads
- [PATCH] drm/nouveau: resume display if any later suspend bits fail
- [PATCH] drm/nouveau: idle all channels before suspending
- [PATCH nouveau 09/11] drm: export some variable and functions to resue the PM functions
- [PATCH nouveau 09/11] drm: export some variable and functions to resue the PM functions
- [PATCH nouveau 09/11] drm: export some variable and functions to resue the PM functions