mirror of
https://gitlab.freedesktop.org/mesa/drm.git
synced 2025-12-20 10:30:11 +01:00
Add a DRM tracker for global objects.
This commit is contained in:
parent
58410a26aa
commit
6941b5a9cc
4 changed files with 132 additions and 1 deletions
|
|
@ -14,7 +14,7 @@ drm-objs := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \
|
||||||
drm_memory_debug.o drm_sman.o \
|
drm_memory_debug.o drm_sman.o \
|
||||||
drm_hashtab.o drm_mm.o drm_compat.o \
|
drm_hashtab.o drm_mm.o drm_compat.o \
|
||||||
drm_crtc.o drm_edid.o drm_modes.o drm_crtc_helper.o \
|
drm_crtc.o drm_edid.o drm_modes.o drm_crtc_helper.o \
|
||||||
drm_vm_nopage_compat.o drm_gem.o
|
drm_vm_nopage_compat.o drm_gem.o drm_global.o
|
||||||
tdfx-objs := tdfx_drv.o
|
tdfx-objs := tdfx_drv.o
|
||||||
r128-objs := r128_drv.o r128_cce.o r128_state.o r128_irq.o
|
r128-objs := r128_drv.o r128_cce.o r128_state.o r128_irq.o
|
||||||
mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
|
mga-objs := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
|
||||||
|
|
|
||||||
|
|
@ -1473,5 +1473,25 @@ extern void drm_free(void *pt, size_t size, int area);
|
||||||
|
|
||||||
/*@}*/
|
/*@}*/
|
||||||
|
|
||||||
|
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 /* __KERNEL__ */
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -472,6 +472,9 @@ static int __init drm_core_init(void)
|
||||||
DRM_INFO("Initialized %s %d.%d.%d %s\n",
|
DRM_INFO("Initialized %s %d.%d.%d %s\n",
|
||||||
CORE_NAME,
|
CORE_NAME,
|
||||||
CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
|
CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
|
||||||
|
|
||||||
|
drm_global_init();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
err_p3:
|
err_p3:
|
||||||
drm_sysfs_destroy();
|
drm_sysfs_destroy();
|
||||||
|
|
@ -485,6 +488,7 @@ err_p1:
|
||||||
|
|
||||||
static void __exit drm_core_exit(void)
|
static void __exit drm_core_exit(void)
|
||||||
{
|
{
|
||||||
|
drm_global_release();
|
||||||
remove_proc_entry("dri", NULL);
|
remove_proc_entry("dri", NULL);
|
||||||
drm_sysfs_destroy();
|
drm_sysfs_destroy();
|
||||||
|
|
||||||
|
|
|
||||||
107
linux-core/drm_global.c
Normal file
107
linux-core/drm_global.c
Normal file
|
|
@ -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);
|
||||||
Loading…
Add table
Reference in a new issue