[PULL] drm-intel-next

[Daniel Vetter]

On Wed, Aug 07, 2013 at 10:27:35AM +1000, Dave Airlie wrote:
> On Mon, Aug 5, 2013 at 5:35 AM, Daniel Vetter <daniel at ffwll.ch> wrote:
> > Hi Dave,
> 
> Okay since I missed this, then I merged patches from the list from
> David Herrmann
> fixing up drm_mm usage, then I merged this and it all fell to pieces.
> 
>   CC [M]  drivers/gpu/drm/i915/i915_gem_gtt.o
>   CC [M]  drivers/gpu/drm/i915/i915_gem_stolen.o
> /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/i915_gem_stolen.c:
> In function ‘i915_gem_object_create_stolen_for_preallocated’:
> /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/i915_gem_stolen.c:426:2:
> error: implicit declaration of function ‘drm_mm_put_block’
> [-Werror=implicit-function-declaration]
>   drm_mm_put_block(stolen);
>   ^
> cc1: some warnings being treated as errors
> 
> Smash a patch on top of this if you like or whatever you it is you want.

Indeed I've merged a little error path fix which added a new put_block
call, and I've missed that this will cause a new conflict. Below the fixup
I've squashed into the nightly tree, can you please squash that into your
merge commit?

Thanks, Daniel


diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index 0d0a3b1..ba4dabc 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -423,7 +423,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
 	return obj;
 
 err_out:
-	drm_mm_put_block(stolen);
+	drm_mm_remove_node(stolen);
+	kfree(stolen);
 	drm_gem_object_unreference(&obj->base);
 	return NULL;
 }
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch