From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Aug 2016 23:29:03 +0000 (-0400)
Subject: Merge tag 'drm-psr-fixes-for-v4.8' of git://people.freedesktop.org/~airlied/linux
X-Git-Tag: v4.8-rc1~55
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=c7fac299672ee98a1da90ea2e473180fc75d2c53;p=karo-tx-linux.git

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()
---

c7fac299672ee98a1da90ea2e473180fc75d2c53