summaryrefslogtreecommitdiff
path: root/linux-core/drmP.h
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@jbarnes-t61.(none)>2008-06-11 10:25:45 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-06-11 10:25:45 -0700
commitf5412a944fa4666e25f4fa27b6ed85c21ccb65a0 (patch)
tree968afc250072af4525757c71bc9f3e18618bcc01 /linux-core/drmP.h
parenta1d96007241a78dd2b4a718df8e0568fe7994c22 (diff)
parent62a3be962f1915d17813ecbfc9544232908b44e4 (diff)
Merge commit 'origin/drm-gem' into modesetting-gem
Use new GEM based ring buffer initialization. Still need to init GEM & use it for framebuffer allocation etc. Conflicts: shared-core/i915_dma.c shared-core/i915_drv.h
Diffstat (limited to 'linux-core/drmP.h')
-rw-r--r--linux-core/drmP.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index c18159f8..ffe8b8ef 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -1453,6 +1453,9 @@ drm_gem_init (struct drm_device *dev);
void
drm_gem_object_free (struct kref *kref);
+struct drm_gem_object *
+drm_gem_object_alloc(struct drm_device *dev, size_t size);
+
void
drm_gem_object_handle_free (struct kref *kref);