search for: 9eb90a6

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 id...

...static inline bool nouveau_has_gmux_dsm(void) { return false; }; static inline void nouveau_register_dsm_handler(void) {} static inline void nouveau_unregister_dsm_handler(void) {} static inline void nouveau_switcheroo_optimus_dsm(void) {} diff --git a/drm/nouveau_drm.c b/drm/nouveau_drm.c index 9eb90a6..414acc4 100644 --- a/drm/nouveau_drm.c +++ b/drm/nouveau_drm.c @@ -719,7 +719,7 @@ nouveau_pmops_runtime_suspend(struct device *dev) } /* are we optimus enabled? */ - if (nouveau_runtime_pm == -1 && !nouveau_is_optimus() && !nouveau_is_v1_dsm()) { + if (nouveau_runtime_pm ==...