Chris Wilson 105f1a65b0 drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next
The conflict resolution of v4.8-rc8 backmerge to drm-next pulled back in
a few lines of dead code due to the code movement around
i915_gem_reset(), fix that up.

Fixes: ca09fb9f60b5 ("Merge tag 'v4.8-rc8' into drm-next")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161010125017.23911-1-chris@chris-wilson.co.uk
2016-10-10 16:12:21 +03:00
..
2016-09-23 11:50:49 -07:00
2016-09-07 21:24:42 -07:00
2016-09-28 12:08:49 +10:00
2016-07-30 21:01:36 -07:00
2016-09-03 10:40:57 -07:00
2016-09-16 13:51:42 -07:00
2016-07-30 21:01:36 -07:00
2016-08-01 18:36:01 -04:00
2016-09-22 02:47:46 -04:00
2016-07-20 23:39:36 -07:00
2016-09-14 14:06:30 -07:00
2016-08-12 14:59:10 +05:30
2016-08-06 00:01:33 -04:00
2016-08-05 09:48:22 -04:00
2016-09-16 04:29:14 -04:00
2016-09-06 11:06:52 -07:00
2016-08-01 18:36:01 -04:00
2016-09-28 12:08:49 +10:00
2016-09-16 17:42:10 +02:00
2016-08-02 19:35:40 -04:00
2016-08-06 09:20:13 -04:00