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

Browse source

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

...

This commit is contained in:

Dave Airlie 2017-06-21 11:22:34 +10:00

parent 41f1830f5a a8ae0a773d

commit 09da4baa4d

8 changed files with 107 additions and 60 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

61

drivers/gpu/drm/i915/i915_gem.c

View file

2

drivers/gpu/drm/i915/i915_gem_request.c

View file

4

drivers/gpu/drm/i915/i915_guc_submission.c

View file

30

drivers/gpu/drm/i915/intel_display.c

View file

2

drivers/gpu/drm/i915/intel_dp_aux_backlight.c

View file

6

drivers/gpu/drm/i915/intel_lrc.c

View file

41

drivers/gpu/drm/i915/intel_ringbuffer.c

View file

19

drivers/gpu/drm/i915/intel_ringbuffer.h

View file