tree fa42ffdf943b6585dc06bb30367afb71319e2058
parent 83fb8b055544a25ceeac34a666a2149331ea94bf
parent e411072d5740a49cdc9d0713798c30440757e451
author Dave Airlie <airlied@redhat.com> 1480797086 +1000
committer Dave Airlie <airlied@redhat.com> 1480797086 +1000

Merge tag 'drm-intel-fixes-2016-12-01' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes

2 intel fixes.

* tag 'drm-intel-fixes-2016-12-01' of git://anongit.freedesktop.org/git/drm-intel:
  drm/i915: drop the struct_mutex when wedged or trying to reset
  drm/i915: Don't touch NULL sg on i915_gem_object_get_pages_gtt() error