tree b65600933ffac25dca7c5ba5bbba5ec7c98fa02a
parent 1b0e19bb0c6f6b209c6b711f47dfc81812706827
parent 069d40f5834ad26a58f269225a7e13af17019062
author Dave Airlie <airlied@redhat.com> 1507252169 +1000
committer Dave Airlie <airlied@redhat.com> 1507252169 +1000

Merge tag 'drm-intel-fixes-2017-10-04' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes

drm/i915 fixes for 4.14-rc4:

All 3 highest GLK bugs fixed by Imre:
- GLK drv reload - Fix DDI Phy init if it was already on.
- GLK suspend resume - Reprogram DMC firmware after s3/s4.
- GLK DC states - Fix idleness calculation.

* tag 'drm-intel-fixes-2017-10-04' of git://anongit.freedesktop.org/git/drm-intel:
  drm/i915/glk: Fix DMC/DC state idleness calculation
  drm/i915/cnl: Reprogram DMC firmware after S3/S4 resume
  drm/i915: Fix DDI PHY init if it was already on