diff options
| author |   Dave Airlie <airlied@redhat.com> | 2017-02-23 12:10:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-23 12:10:12 +1000 |
| commit | 94000cc32988a0674923309d35ab9c2405c4b39b (patch) | |
| tree | ef9d58ea9ad614bfdf6d0c7c6293f05dbd989475 /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | Merge tag 'drm-tinydrm-2017-02-18' of https://github.com/notro/linux into drm-next (diff) | |
| parent | Linux 4.10-rc8 (diff) | |
| download | linux-dev-94000cc32988a0674923309d35ab9c2405c4b39b.tar.xz linux-dev-94000cc32988a0674923309d35ab9c2405c4b39b.zip | |
Merge tag 'v4.10-rc8' into drm-next
Linux 4.10-rc8
Backmerge Linus rc8 to fix some conflicts, but also
to avoid pulling it in via a fixes pull from someone.
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 95529d1f2b5b..468ed1d3bb26 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -773,7 +773,10 @@ nouveau_pmops_runtime_resume(struct device *dev) pci_set_master(pdev); ret = nouveau_do_resume(drm_dev, true); - drm_kms_helper_poll_enable(drm_dev); + + if (!drm_dev->mode_config.poll_enabled) + drm_kms_helper_poll_enable(drm_dev); + /* do magic */ nvif_mask(&device->object, 0x088488, (1 << 25), (1 << 25)); vga_switcheroo_set_dynamic_switch(pdev, VGA_SWITCHEROO_ON); |