Merge tag 'drm-intel-fixes-2016-12-01' of git://anongit.freedesktop.org/git/drm-intel...
authorDave Airlie <airlied@redhat.com>
Sat, 3 Dec 2016 20:31:26 +0000 (06:31 +1000)
committerDave Airlie <airlied@redhat.com>
Sat, 3 Dec 2016 20:31:26 +0000 (06:31 +1000)
commitab7cd8d83e5dba13027de66f1b008b08b30b71a4
treefa42ffdf943b6585dc06bb30367afb71319e2058
parent83fb8b055544a25ceeac34a666a2149331ea94bf
parente411072d5740a49cdc9d0713798c30440757e451
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