On Tue, Jul 02, 2013 at 10:25:17AM +0100, Chris Wilson wrote: > On Tue, Jul 02, 2013 at 10:48:31AM +0200, Daniel Vetter wrote: > > Every other place properly checks whether we've managed to set > > up the stolen allocator at boot-up properly, with the exception > > of the cleanup code. Which results in an ugly > > > > *ERROR* Memory manager not clean. Delaying takedown > > > > at module unload time since the drm_mm isn't initialized at all. > > > > v2: While at it check whether the stolen drm_mm is initialized instead > > of the more obscure stolen_base == 0 check. > > > > v3: Fix up the logic. Also we need to keep the stolen_base check in > > i915_gem_object_create_stolen_for_preallocated since that can be > > called before stolen memory is fully set up. Spotted by Chris Wilson. > > > > v4: Readd the conversion in i915_gem_object_create_stolen_for_preallocated, > > the check is for the dev_priv->mm.gtt_space drm_mm, the stolen > > allocatot must already be initialized when calling that function (if > > we indeed have stolen memory). > > > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65953 > > Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > > Tested-by: lu hua <huax.lu@xxxxxxxxx> (v3) > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx> > > Reviewed-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Thanks for the review, merged to -fixes. > > Once thing I noticed is that we should probably warn if vlv_reserved >= > stolen_size. I've added that patch to my queue, I'll submit it together with the gm45 reset fixes (once QA has tested them). -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
