diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-05-17 21:12:50 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-05-17 21:12:50 -0400 |
| commit | e7ca7f9fa2cda220ba807620c992ce77c33a32ea (patch) | |
| tree | fb8a6c1abc638c5a79645f4b9f44ece7c67187b4 /drivers/gpu/drm/i915/intel_lvds.c | |
| parent | 5f0dfb7a9bcc8139958f59ecb9bbd7e738ae702d (diff) | |
| parent | d65c8fff867a6450c58ce31572e883148a445ddf (diff) | |
| download | op-kernel-dev-e7ca7f9fa2cda220ba807620c992ce77c33a32ea.zip op-kernel-dev-e7ca7f9fa2cda220ba807620c992ce77c33a32ea.tar.gz | |
Merge branch 'fixes' into misc
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 30a8403..cd9fe60 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -478,11 +478,8 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val, * and as part of the cleanup in the hw state restore we also redisable * the vga plane. */ - if (!HAS_PCH_SPLIT(dev)) { - drm_modeset_lock_all(dev); + if (!HAS_PCH_SPLIT(dev)) intel_display_resume(dev); - drm_modeset_unlock_all(dev); - } dev_priv->modeset_restore = MODESET_DONE; |
