diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-02-07 11:38:44 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-02-07 11:38:44 +0300 |
| commit | 1e94320ffee29424ef70cdbb7f5601216382b7e6 (patch) | |
| tree | 5558a860abefef6d348cd586cb3aa177de0d1476 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | e1b239f371c0c745542cb8108d085ec728e8a69c (diff) | |
| parent | f3d83317a69e7d658e7c83e24f8b31ac533c39e3 (diff) | |
| download | linux-1e94320ffee29424ef70cdbb7f5601216382b7e6.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 9b8d81fa0441..77ae0be3d4ba 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -2378,7 +2378,7 @@ static int intel_runtime_suspend(struct device *kdev) assert_forcewakes_inactive(dev_priv); - if (!IS_VALLEYVIEW(dev_priv) || !IS_CHERRYVIEW(dev_priv)) + if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv)) intel_hpd_poll_init(dev_priv); DRM_DEBUG_KMS("Device suspended\n"); |