summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel@tungstengraphics.com>2007-10-16 15:10:08 +0200
committerMichel Dänzer <michel@tungstengraphics.com>2007-10-16 15:10:22 +0200
commitdb1709f2f3f8cab2477fb149b58420de4db65654 (patch)
tree4d3053a61b087f55533337cad92fcd43aca2ff0a
parent3f1aa1550353e828814169915c9a74c67d2e81cd (diff)
Revert part of earlier commit that caused an unresolved symbol for i915.
-rw-r--r--linux-core/drm_fence.c3
-rw-r--r--linux-core/drm_objects.h3
2 files changed, 5 insertions, 1 deletions
diff --git a/linux-core/drm_fence.c b/linux-core/drm_fence.c
index d1969f86..e696b42d 100644
--- a/linux-core/drm_fence.c
+++ b/linux-core/drm_fence.c
@@ -517,7 +517,7 @@ static int drm_fence_object_init(struct drm_device * dev, uint32_t fence_class,
return ret;
}
-static int drm_fence_add_user_object(struct drm_file * priv, struct drm_fence_object * fence,
+int drm_fence_add_user_object(struct drm_file * priv, struct drm_fence_object * fence,
int shareable)
{
struct drm_device *dev = priv->head->dev;
@@ -535,6 +535,7 @@ out:
mutex_unlock(&dev->struct_mutex);
return ret;
}
+EXPORT_SYMBOL(drm_fence_add_user_object);
int drm_fence_object_create(struct drm_device * dev, uint32_t fence_class, uint32_t type,
unsigned flags, struct drm_fence_object ** c_fence)
diff --git a/linux-core/drm_objects.h b/linux-core/drm_objects.h
index 67c33745..726ccbe2 100644
--- a/linux-core/drm_objects.h
+++ b/linux-core/drm_objects.h
@@ -213,6 +213,9 @@ extern int drm_fence_object_emit(struct drm_fence_object * fence,
extern void drm_fence_fill_arg(struct drm_fence_object *fence,
struct drm_fence_arg *arg);
+extern int drm_fence_add_user_object(struct drm_file * priv,
+ struct drm_fence_object * fence, int shareable);
+
extern int drm_fence_create_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
extern int drm_fence_destroy_ioctl(struct drm_device *dev, void *data,