diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-13 13:35:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-13 13:35:28 +0100 |
| commit | 56b4811039174bba9cbd68318d0d8b1585b9eded (patch) | |
| tree | f3e8f99e85e545662d82e18bef2a7009c2948852 /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | e777b63bbd589248eb151a3191ee92331a701385 (diff) | |
| parent | 9722c2dac708e9468cc0dc30218ef76946ffbc9d (diff) | |
| download | blackbird-obmc-linux-56b4811039174bba9cbd68318d0d8b1585b9eded.tar.gz blackbird-obmc-linux-56b4811039174bba9cbd68318d0d8b1585b9eded.zip | |
Merge branch 'sched/urgent' into sched/core
Pick up the latest fixes before applying new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 7a3759f1c41a..98a22e6e27a1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -858,6 +858,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; + } + nv_debug_level(SILENT); drm_kms_helper_poll_disable(drm_dev); vga_switcheroo_set_dynamic_switch(pdev, VGA_SWITCHEROO_OFF); |
