diff options
author | Dave Airlie <airlied@redhat.com> | 2017-04-19 11:07:14 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-04-19 11:07:14 +1000 |
commit | 856ee92e8602bd86d34388ac08381c5cb3918756 (patch) | |
tree | c3bed2bf85214f78239724adb34a1c2d6ec8444d /drivers/gpu/drm/i915/i915_drv.c | |
parent | Merge tag 'drm-misc-next-fixes-2017-04-12' of git://anongit.freedesktop.org/git/drm-misc into drm-next (diff) | |
parent | Linux 4.11-rc7 (diff) | |
download | linux-dev-856ee92e8602bd86d34388ac08381c5cb3918756.tar.xz linux-dev-856ee92e8602bd86d34388ac08381c5cb3918756.zip |
Merge tag 'v4.11-rc7' into drm-next
Backmerge Linux 4.11-rc7 from Linus tree, to fix some
conflicts that were causing problems with the rerere cache
in drm-tip.
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index c616b4e755bc..7b4fa84cbc3c 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1469,8 +1469,6 @@ static int i915_drm_suspend(struct drm_device *dev) goto out; } - intel_guc_suspend(dev_priv); - intel_display_suspend(dev); intel_dp_mst_suspend(dev); |