drm/i915: fix module unload after context merge
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 19 Jun 2012 19:55:32 +0000 (21:55 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 20 Jun 2012 08:06:29 +0000 (10:06 +0200)
commit55a6662837a5efe48c836bfc3570ace348f3db09
treebf24c1d1e062762abe4abad777fd362bc9764af0
parente3f33d46fd917747e966f8e6d25f2940223ad1ee
drm/i915: fix module unload after context merge

commit 8e96d9c4d9843f00ebeb4a9b33596d96602ea101
Author: Ben Widawsky <ben@bwidawsk.net>
Date:   Mon Jun 4 14:42:56 2012 -0700

    drm/i915: reset the GPU on context fini

broke module unload because it reset the gpu before we've stopped
touching it. Later on in the unload sequence the ringbuffer code
complained that the gpu would idle properly (because intel_gpu_reset
only resets the hw and not our sw state).

v2: Reorder things so that we reset the gpu _before_ we release the
backing storage of the default context.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=51183
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_gem_context.c