Merge branch 'drm-ttm-unmappable' into drm-core-next
[pandora-kernel.git] / drivers / gpu / drm / nouveau / nouveau_gem.c
index 1bc0b38..69c76cf 100644 (file)
@@ -57,6 +57,9 @@ nouveau_gem_object_del(struct drm_gem_object *gem)
        }
 
        ttm_bo_unref(&bo);
+
+       drm_gem_object_release(gem);
+       kfree(gem);
 }
 
 int
@@ -382,7 +385,7 @@ validate_list(struct nouveau_channel *chan, struct list_head *list,
 
                nvbo->channel = chan;
                ret = ttm_bo_validate(&nvbo->bo, &nvbo->placement,
-                                     false, false);
+                                     false, false, false);
                nvbo->channel = NULL;
                if (unlikely(ret)) {
                        NV_ERROR(dev, "fail ttm_validate\n");