Merge tag 'drm-intel-fixes-2015-05-13' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 15 May 2015 05:21:18 +0000 (15:21 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 15 May 2015 05:21:18 +0000 (15:21 +1000)
commit472313245645661c3bc710f874e660c493d313e1
tree0e6ac1f69b83c32cd8505d9863801dba7c4cea3f
parente52f649e5b7ad61edfe2b7273831fa3b64c76149
parent364aece01a2dd748fc36a1e8bf52ef639b0857bd
Merge tag 'drm-intel-fixes-2015-05-13' of git://anongit.freedesktop.org/drm-intel into drm-fixes

fix one gpu hang on resume.

* tag 'drm-intel-fixes-2015-05-13' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Avoid GPU hang when coming out of s3 or s4