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

Browse source

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

...

This commit is contained in:

Dave Airlie 2017-08-18 05:43:10 +10:00

parent ef954844c7 781cc76e0c

commit 41d31b5fd2

6 changed files with 21 additions and 10 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

2

drivers/gpu/drm/i915/i915_debugfs.c

View file

15

drivers/gpu/drm/i915/i915_gem_context.c

View file

4

drivers/gpu/drm/i915/i915_gem_render_state.c

View file

2

drivers/gpu/drm/i915/intel_ddi.c

View file

7

drivers/gpu/drm/i915/intel_display.c

View file

1

drivers/gpu/drm/i915/intel_lrc.h

View file