Merge tag 'drm-psr-fixes-for-v4.8' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Aug 2016 23:29:03 +0000 (19:29 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Aug 2016 23:29:03 +0000 (19:29 -0400)
commitc7fac299672ee98a1da90ea2e473180fc75d2c53
treee0b325e271f17fe73bfe90e01118b01b3c93815c
parentc8d0267efdb4ab16cd0ed6e0218e8c164006de48
parentdfd2e9ab6a7db56a5f5bb55f71485a92613c8e11
Merge tag 'drm-psr-fixes-for-v4.8' of git://people.freedesktop.org/~airlied/linux

Pull i915 drm fixes from Dave Airlie:
 "These are the two fixes from Ville for the bug you are seeing on your
  HSW laptop.

  They pretty much disable PSR in some cases where the panel reports a
  setup time that would cause issues, like you seem to have"

* tag 'drm-psr-fixes-for-v4.8' of git://people.freedesktop.org/~airlied/linux:
  drm/i915: Check PSR setup time vs. vblank length
  drm/dp: Add drm_dp_psr_setup_time()