Merge tag 'drm-intel-fixes-2017-08-16' of git://anongit.freedesktop.org/git/drm-intel...
authorDave Airlie <airlied@redhat.com>
Thu, 17 Aug 2017 19:43:10 +0000 (05:43 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 17 Aug 2017 19:43:10 +0000 (05:43 +1000)
commit41d31b5fd29bd768a7174b754249c97563c21fae
tree3c3d1f16f3ec2706a463a388ae58c699b9b22144
parentef954844c7ace62f773f4f23e28d2d915adc419f
parent781cc76e0c2469cb7ac12ba238a4ea006978e321
Merge tag 'drm-intel-fixes-2017-08-16' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes

drm/i915 fixes for v4.13-rc6

"Chris' "drm/i915: Perform an invalidate prior to executing golden renderstate" and Daniel's
"drm/i915: Avoid the gpu reset vs. modeset deadlock" seem like the most important ones.

* tag 'drm-intel-fixes-2017-08-16' of git://anongit.freedesktop.org/git/drm-intel:
  drm/i915: Avoid the gpu reset vs. modeset deadlock
  drm/i915: Suppress switch_mm emission between the same aliasing_ppgtt
  drm/i915: Return correct EDP voltage swing table for 0.85V
  drm/i915/cnl: Add slice and subslice information to debugfs.
  drm/i915: Perform an invalidate prior to executing golden renderstate
  drm/i915: remove unused function declaration