Author: kib
Date: Thu Apr 4 05:47:50 2013
New Revision: 249082
URL: http://svnweb.freebsd.org/changeset/base/249082
Log:
MFC r247834:
Import the drm_global references helpers.
MFC r247839 (by dumbbell):
Destroy sx in drm_global_release().
Added:
stable/9/sys/dev/drm2/drm_global.c
- copied, changed from r247834, head/sys/dev/drm2/drm_global.c
stable/9/sys/dev/drm2/drm_global.h
- copied unchanged from r247834, head/sys/dev/drm2/drm_global.h
Modified:
stable/9/sys/modules/drm2/drm2/Makefile
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/modules/ (props changed)
Copied and modified: stable/9/sys/dev/drm2/drm_global.c (from r247834,
head/sys/dev/drm2/drm_global.c)
==============================================================================
--- head/sys/dev/drm2/drm_global.c Tue Mar 5 09:27:21 2013
(r247834, copy source)
+++ stable/9/sys/dev/drm2/drm_global.c Thu Apr 4 05:47:50 2013
(r249082)
@@ -63,6 +63,7 @@ void drm_global_release(void)
struct drm_global_item *item = &glob[i];
MPASS(item->object == NULL);
MPASS(item->refcount == 0);
+ sx_destroy(&item->mutex);
}
}
Copied: stable/9/sys/dev/drm2/drm_global.h (from r247834,
head/sys/dev/drm2/drm_global.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/sys/dev/drm2/drm_global.h Thu Apr 4 05:47:50 2013
(r249082, copy of r247834, head/sys/dev/drm2/drm_global.h)
@@ -0,0 +1,56 @@
+/**************************************************************************
+ *
+ * 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.
+ *
+ **************************************************************************/
+/*
+ * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
+ */
+/* $FreeBSD$ */
+
+#ifndef _DRM_GLOBAL_H_
+#define _DRM_GLOBAL_H_
+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);
+
+MALLOC_DECLARE(M_DRM_GLOBAL);
+
+#endif
Modified: stable/9/sys/modules/drm2/drm2/Makefile
==============================================================================
--- stable/9/sys/modules/drm2/drm2/Makefile Thu Apr 4 05:39:37 2013
(r249081)
+++ stable/9/sys/modules/drm2/drm2/Makefile Thu Apr 4 05:47:50 2013
(r249082)
@@ -18,6 +18,7 @@ SRCS = \
drm_fops.c \
drm_gem.c \
drm_gem_names.c \
+ drm_global.c \
drm_hashtab.c \
drm_ioctl.c \
drm_irq.c \
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
