Merge tag 'drm-intel-fixes-2017-06-20' of git://anongit.freedesktop.org/git/drm-intel...
authorDave Airlie <airlied@redhat.com>
Wed, 21 Jun 2017 01:22:34 +0000 (11:22 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 21 Jun 2017 01:22:34 +0000 (11:22 +1000)
commit09da4baa4d502833a1ac79aea4ff85d08bb48871
tree1c10c281d2334c391b4daf73c74557a1106bec59
parent41f1830f5a7af77cf5c86359aba3cbd706687e52
parenta8ae0a773d38b4b1d4566b0edcb6bb63f4a9d22f
Merge tag 'drm-intel-fixes-2017-06-20' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes

drm/i915 fixes for v4.12-rc7

* tag 'drm-intel-fixes-2017-06-20' of git://anongit.freedesktop.org/git/drm-intel:
  drm/i915: Don't enable backlight at setup time.
  drm/i915: Plumb the correct acquire ctx into intel_crtc_disable_noatomic()
  drm/i915: Fix deadlock witha the pipe A quirk during resume
  drm/i915: Remove __GFP_NORETRY from our buffer allocator
  drm/i915: Encourage our shrinker more when our shmemfs allocations fails
  drm/i915: Differentiate between sw write location into ring and last hw read