aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2018-10-19 04:54:23 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-11-05 14:21:21 -0500
commit2bb42410b1bd324912389c6ac748df1c1befd69f (patch)
tree2b24ac6455923a84d3c6f9b8508ebc37c88c2321 /drivers
parenta64f784bb14a56bfdfad2dc397dd67e4564e3a29 (diff)
drm: Remove drm_global.{c,h} v2
The content of drm_global.{c,h} is obsolete. v2: rebase on dropping TTM functionality Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/Makefile2
-rw-r--r--drivers/gpu/drm/drm_drv.c2
-rw-r--r--drivers/gpu/drm/drm_global.c137
3 files changed, 1 insertions, 140 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index bc6a16a3c36e..32a837b72765 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -11,7 +11,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \
11 drm_sysfs.o drm_hashtab.o drm_mm.o \ 11 drm_sysfs.o drm_hashtab.o drm_mm.o \
12 drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o \ 12 drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o \
13 drm_info.o drm_encoder_slave.o \ 13 drm_info.o drm_encoder_slave.o \
14 drm_trace_points.o drm_global.o drm_prime.o \ 14 drm_trace_points.o drm_prime.o \
15 drm_rect.o drm_vma_manager.o drm_flip_work.o \ 15 drm_rect.o drm_vma_manager.o drm_flip_work.o \
16 drm_modeset_lock.o drm_atomic.o drm_bridge.o \ 16 drm_modeset_lock.o drm_atomic.o drm_bridge.o \
17 drm_framebuffer.o drm_connector.o drm_blend.o \ 17 drm_framebuffer.o drm_connector.o drm_blend.o \
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 36e8e9cbec52..fc29f46b7c32 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -975,14 +975,12 @@ static void drm_core_exit(void)
975 drm_sysfs_destroy(); 975 drm_sysfs_destroy();
976 idr_destroy(&drm_minors_idr); 976 idr_destroy(&drm_minors_idr);
977 drm_connector_ida_destroy(); 977 drm_connector_ida_destroy();
978 drm_global_release();
979} 978}
980 979
981static int __init drm_core_init(void) 980static int __init drm_core_init(void)
982{ 981{
983 int ret; 982 int ret;
984 983
985 drm_global_init();
986 drm_connector_ida_init(); 984 drm_connector_ida_init();
987 idr_init(&drm_minors_idr); 985 idr_init(&drm_minors_idr);
988 986
diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
deleted file mode 100644
index 5799e2782dd1..000000000000
--- a/drivers/gpu/drm/drm_global.c
+++ /dev/null
@@ -1,137 +0,0 @@
1// SPDX-License-Identifier: GPL-2.0 OR MIT
2/**************************************************************************
3 *
4 * Copyright 2008-2009 VMware, Inc., Palo Alto, CA., USA
5 *
6 * Permission is hereby granted, free of charge, to any person obtaining a
7 * copy of this software and associated documentation files (the
8 * "Software"), to deal in the Software without restriction, including
9 * without limitation the rights to use, copy, modify, merge, publish,
10 * distribute, sub license, and/or sell copies of the Software, and to
11 * permit persons to whom the Software is furnished to do so, subject to
12 * the following conditions:
13 *
14 * The above copyright notice and this permission notice (including the
15 * next paragraph) shall be included in all copies or substantial portions
16 * of the Software.
17 *
18 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20 * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
21 * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
22 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
23 * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
24 * USE OR OTHER DEALINGS IN THE SOFTWARE.
25 *
26 **************************************************************************/
27/*
28 * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
29 */
30
31#include <linux/mutex.h>
32#include <linux/slab.h>
33#include <linux/module.h>
34#include <drm/drm_global.h>
35
36struct drm_global_item {
37 struct mutex mutex;
38 void *object;
39 int refcount;
40};
41
42static struct drm_global_item glob[DRM_GLOBAL_NUM];
43
44void drm_global_init(void)
45{
46 int i;
47
48 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
49 struct drm_global_item *item = &glob[i];
50 mutex_init(&item->mutex);
51 item->object = NULL;
52 item->refcount = 0;
53 }
54}
55
56void drm_global_release(void)
57{
58 int i;
59 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
60 struct drm_global_item *item = &glob[i];
61 BUG_ON(item->object != NULL);
62 BUG_ON(item->refcount != 0);
63 }
64}
65
66/**
67 * drm_global_item_ref - Initialize and acquire reference to memory
68 * object
69 * @ref: Object for initialization
70 *
71 * This initializes a memory object, allocating memory and calling the
72 * .init() hook. Further calls will increase the reference count for
73 * that item.
74 *
75 * Returns:
76 * Zero on success, non-zero otherwise.
77 */
78int drm_global_item_ref(struct drm_global_reference *ref)
79{
80 int ret = 0;
81 struct drm_global_item *item = &glob[ref->global_type];
82
83 mutex_lock(&item->mutex);
84 if (item->refcount == 0) {
85 ref->object = kzalloc(ref->size, GFP_KERNEL);
86 if (unlikely(ref->object == NULL)) {
87 ret = -ENOMEM;
88 goto error_unlock;
89 }
90 ret = ref->init(ref);
91 if (unlikely(ret != 0))
92 goto error_free;
93
94 item->object = ref->object;
95 } else {
96 ref->object = item->object;
97 }
98
99 ++item->refcount;
100 mutex_unlock(&item->mutex);
101 return 0;
102
103error_free:
104 kfree(ref->object);
105 ref->object = NULL;
106error_unlock:
107 mutex_unlock(&item->mutex);
108 return ret;
109}
110EXPORT_SYMBOL(drm_global_item_ref);
111
112/**
113 * drm_global_item_unref - Drop reference to memory
114 * object
115 * @ref: Object being removed
116 *
117 * Drop a reference to the memory object and eventually call the
118 * release() hook. The allocated object should be dropped in the
119 * release() hook or before calling this function
120 *
121 */
122
123void drm_global_item_unref(struct drm_global_reference *ref)
124{
125 struct drm_global_item *item = &glob[ref->global_type];
126
127 mutex_lock(&item->mutex);
128 BUG_ON(item->refcount == 0);
129 BUG_ON(ref->object != item->object);
130 if (--item->refcount == 0) {
131 ref->release(ref);
132 item->object = NULL;
133 }
134 mutex_unlock(&item->mutex);
135}
136EXPORT_SYMBOL(drm_global_item_unref);
137