192 lines
6.0 KiB
Diff
192 lines
6.0 KiB
Diff
From cd04a0500d70ea012089ec38183f20c0c30f8ba5 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
|
|
Date: Fri, 27 Feb 2009 12:31:58 +0100
|
|
Subject: [PATCH 2/8] drm: Add a tracker for global objects.
|
|
|
|
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
|
|
---
|
|
drivers/gpu/drm/Makefile | 3 +-
|
|
drivers/gpu/drm/drm_drv.c | 3 +
|
|
drivers/gpu/drm/drm_global.c | 107 ++++++++++++++++++++++++++++++++++++++++++
|
|
include/drm/drmP.h | 20 ++++++++
|
|
4 files changed, 132 insertions(+), 1 deletions(-)
|
|
create mode 100644 drivers/gpu/drm/drm_global.c
|
|
|
|
Index: linux-2.6.28/drivers/gpu/drm/Makefile
|
|
===================================================================
|
|
--- linux-2.6.28.orig/drivers/gpu/drm/Makefile 2009-03-12 13:13:54.000000000 +0000
|
|
+++ linux-2.6.28/drivers/gpu/drm/Makefile 2009-03-12 13:15:18.000000000 +0000
|
|
@@ -10,7 +10,8 @@
|
|
drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
|
|
drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
|
|
drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
|
|
- drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o
|
|
+ drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o \
|
|
+ drm_global.o
|
|
|
|
drm-$(CONFIG_COMPAT) += drm_ioc32.o
|
|
|
|
Index: linux-2.6.28/drivers/gpu/drm/drm_drv.c
|
|
===================================================================
|
|
--- linux-2.6.28.orig/drivers/gpu/drm/drm_drv.c 2009-03-12 13:13:54.000000000 +0000
|
|
+++ linux-2.6.28/drivers/gpu/drm/drm_drv.c 2009-03-12 13:37:56.000000000 +0000
|
|
@@ -382,6 +382,8 @@
|
|
|
|
DRM_INFO("Initialized %s %d.%d.%d %s\n",
|
|
CORE_NAME, CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
|
|
+ drm_global_init();
|
|
+
|
|
return 0;
|
|
err_p3:
|
|
drm_sysfs_destroy();
|
|
@@ -395,6 +397,7 @@
|
|
|
|
static void __exit drm_core_exit(void)
|
|
{
|
|
+ drm_global_release();
|
|
remove_proc_entry("dri", NULL);
|
|
drm_sysfs_destroy();
|
|
|
|
Index: linux-2.6.28/drivers/gpu/drm/drm_global.c
|
|
===================================================================
|
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
+++ linux-2.6.28/drivers/gpu/drm/drm_global.c 2009-03-12 13:15:18.000000000 +0000
|
|
@@ -0,0 +1,107 @@
|
|
+/**************************************************************************
|
|
+ *
|
|
+ * Copyright 2008-2009 VMware, Inc., Palo Alto, CA., USA
|
|
+ * All Rights Reserved.
|
|
+ *
|
|
+ * Permission is hereby granted, free of charge, to any person obtaining a
|
|
+ * copy of this software and associated documentation files (the
|
|
+ * "Software"), to deal in the Software without restriction, including
|
|
+ * without limitation the rights to use, copy, modify, merge, publish,
|
|
+ * distribute, sub license, and/or sell copies of the Software, and to
|
|
+ * permit persons to whom the Software is furnished to do so, subject to
|
|
+ * the following conditions:
|
|
+ *
|
|
+ * The above copyright notice and this permission notice (including the
|
|
+ * next paragraph) shall be included in all copies or substantial portions
|
|
+ * of the Software.
|
|
+ *
|
|
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
|
|
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
|
|
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
|
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
|
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
+ *
|
|
+ **************************************************************************/
|
|
+#include <drmP.h>
|
|
+struct drm_global_item {
|
|
+ struct mutex mutex;
|
|
+ void *object;
|
|
+ int refcount;
|
|
+};
|
|
+
|
|
+static struct drm_global_item glob[DRM_GLOBAL_NUM];
|
|
+
|
|
+void drm_global_init(void)
|
|
+{
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
|
|
+ struct drm_global_item *item = &glob[i];
|
|
+ mutex_init(&item->mutex);
|
|
+ item->object = NULL;
|
|
+ item->refcount = 0;
|
|
+ }
|
|
+}
|
|
+
|
|
+void drm_global_release(void)
|
|
+{
|
|
+ int i;
|
|
+ for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
|
|
+ struct drm_global_item *item = &glob[i];
|
|
+ BUG_ON(item->object != NULL);
|
|
+ BUG_ON(item->refcount != 0);
|
|
+ }
|
|
+}
|
|
+
|
|
+int drm_global_item_ref(struct drm_global_reference *ref)
|
|
+{
|
|
+ int ret;
|
|
+ struct drm_global_item *item = &glob[ref->global_type];
|
|
+ void *object;
|
|
+
|
|
+ mutex_lock(&item->mutex);
|
|
+ if (item->refcount == 0) {
|
|
+ item->object = kmalloc(ref->size, GFP_KERNEL);
|
|
+ if (unlikely(item->object == NULL)) {
|
|
+ ret = -ENOMEM;
|
|
+ goto out_err;
|
|
+ }
|
|
+
|
|
+ ref->object = item->object;
|
|
+ ret = ref->init(ref);
|
|
+ if (unlikely(ret != 0))
|
|
+ goto out_err;
|
|
+
|
|
+ ++item->refcount;
|
|
+ }
|
|
+ ref->object = item->object;
|
|
+ object = item->object;
|
|
+ mutex_unlock(&item->mutex);
|
|
+ return 0;
|
|
+ out_err:
|
|
+ kfree(item->object);
|
|
+ mutex_unlock(&item->mutex);
|
|
+ item->object = NULL;
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+EXPORT_SYMBOL(drm_global_item_ref);
|
|
+
|
|
+void drm_global_item_unref(struct drm_global_reference *ref)
|
|
+{
|
|
+ struct drm_global_item *item = &glob[ref->global_type];
|
|
+
|
|
+ mutex_lock(&item->mutex);
|
|
+ BUG_ON(item->refcount == 0);
|
|
+ BUG_ON(ref->object != item->object);
|
|
+ if (--item->refcount == 0) {
|
|
+ ref->release(ref);
|
|
+ kfree(item->object);
|
|
+ item->object = NULL;
|
|
+ }
|
|
+ mutex_unlock(&item->mutex);
|
|
+}
|
|
+
|
|
+EXPORT_SYMBOL(drm_global_item_unref);
|
|
Index: linux-2.6.28/include/drm/drmP.h
|
|
===================================================================
|
|
--- linux-2.6.28.orig/include/drm/drmP.h 2009-03-12 13:15:05.000000000 +0000
|
|
+++ linux-2.6.28/include/drm/drmP.h 2009-03-12 13:37:56.000000000 +0000
|
|
@@ -1412,5 +1412,25 @@
|
|
|
|
/*@}*/
|
|
|
|
+enum drm_global_types {
|
|
+ DRM_GLOBAL_TTM_MEM = 0,
|
|
+ DRM_GLOBAL_TTM_BO,
|
|
+ DRM_GLOBAL_TTM_OBJECT,
|
|
+ DRM_GLOBAL_NUM
|
|
+};
|
|
+
|
|
+struct drm_global_reference {
|
|
+ enum drm_global_types global_type;
|
|
+ size_t size;
|
|
+ void *object;
|
|
+ int (*init) (struct drm_global_reference *);
|
|
+ void (*release) (struct drm_global_reference *);
|
|
+};
|
|
+
|
|
+extern void drm_global_init(void);
|
|
+extern void drm_global_release(void);
|
|
+extern int drm_global_item_ref(struct drm_global_reference *ref);
|
|
+extern void drm_global_item_unref(struct drm_global_reference *ref);
|
|
+
|
|
#endif /* __KERNEL__ */
|
|
#endif
|