diff options
| author | Chris Wilson <[email protected]> | 2016-10-10 12:50:17 +0000 |
|---|---|---|
| committer | Jani Nikula <[email protected]> | 2016-10-10 13:12:21 +0000 |
| commit | 105f1a65b04a8f4f7abec11b200b1fb54f3d4b46 (patch) | |
| tree | a33c65845ec5b8e3ba9257dc4030344c410476d0 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | drm/i915/guc: Unwind GuC workqueue reservation if request construction fails (diff) | |
| download | kernel-105f1a65b04a8f4f7abec11b200b1fb54f3d4b46.tar.gz kernel-105f1a65b04a8f4f7abec11b200b1fb54f3d4b46.zip | |
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 <[email protected]>
Cc: Jani Nikula <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Dave Airlie <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
0 files changed, 0 insertions, 0 deletions