From: Ilia Mirkin Date: Thu, 12 Dec 2013 03:19:01 +0000 (-0500) Subject: drm/nouveau: only runtime suspend by default in optimus configuration X-Git-Tag: v3.12.7~59 X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=d71c346c8c008f1b27eecdc15fa2fb5fb8fa1751;p=unionfs-2.6.39.y.git drm/nouveau: only runtime suspend by default in optimus configuration commit b25b4427e9dfba073cf9bc86603956ed395eb6e3 upstream. The intent was to only enable it by default for optimus, e.g. see the runtime_idle callback. The suspend callback may be called directly, e.g. as a result of nouveau_crtc_set_config. Reported-by: Stefan Lippers-Hollmann Signed-off-by: Ilia Mirkin Tested-by: Stefan Lippers-Hollmann Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index e893c536240..32c6b0a60fb 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -879,6 +879,12 @@ static int nouveau_pmops_runtime_suspend(struct device *dev) if (nouveau_runtime_pm == 0) return -EINVAL; + /* are we optimus enabled? */ + if (nouveau_runtime_pm == -1 && !nouveau_is_optimus() && !nouveau_is_v1_dsm()) { + DRM_DEBUG_DRIVER("failing to power off - not optimus\n"); + return -EINVAL; + } + drm_kms_helper_poll_disable(drm_dev); vga_switcheroo_set_dynamic_switch(pdev, VGA_SWITCHEROO_OFF); nouveau_switcheroo_optimus_dsm();