drm: Remove drm_global.{c,h} v2 (2bb42410) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/gpu/drm/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \
		drm_sysfs.o drm_hashtab.o drm_mm.o \
		drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o \
		drm_info.o drm_encoder_slave.o \
		drm_trace_points.o drm_global.o drm_prime.o \
		drm_trace_points.o drm_prime.o \
		drm_rect.o drm_vma_manager.o drm_flip_work.o \
		drm_modeset_lock.o drm_atomic.o drm_bridge.o \
		drm_framebuffer.o drm_connector.o drm_blend.o \

drivers/gpu/drm/drm_drv.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -975,14 +975,12 @@ static void drm_core_exit(void)
		drm_sysfs_destroy();
		idr_destroy(&drm_minors_idr);
		drm_connector_ida_destroy();
		drm_global_release();
		}

		static int __init drm_core_init(void)
		{
		int ret;

		drm_global_init();
		drm_connector_ida_init();
		idr_init(&drm_minors_idr);

drivers/gpu/drm/drm_global.c

deleted100644 → 0

+0 −137

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0 OR MIT
		/**************************************************************************
		*
		* Copyright 2008-2009 VMware, Inc., Palo Alto, CA., USA
		*
		* 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>
		*/

		#include <linux/mutex.h>
		#include <linux/slab.h>
		#include <linux/module.h>
		#include <drm/drm_global.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);
		}
		}

		/**
		* drm_global_item_ref - Initialize and acquire reference to memory
		* object
		* @ref: Object for initialization
		*
		* This initializes a memory object, allocating memory and calling the
		* .init() hook. Further calls will increase the reference count for
		* that item.
		*
		* Returns:
		* Zero on success, non-zero otherwise.
		*/
		int drm_global_item_ref(struct drm_global_reference *ref)
		{
		int ret = 0;
		struct drm_global_item *item = &glob[ref->global_type];

		mutex_lock(&item->mutex);
		if (item->refcount == 0) {
		ref->object = kzalloc(ref->size, GFP_KERNEL);
		if (unlikely(ref->object == NULL)) {
		ret = -ENOMEM;
		goto error_unlock;
		}
		ret = ref->init(ref);
		if (unlikely(ret != 0))
		goto error_free;

		item->object = ref->object;
		} else {
		ref->object = item->object;
		}

		++item->refcount;
		mutex_unlock(&item->mutex);
		return 0;

		error_free:
		kfree(ref->object);
		ref->object = NULL;
		error_unlock:
		mutex_unlock(&item->mutex);
		return ret;
		}
		EXPORT_SYMBOL(drm_global_item_ref);

		/**
		* drm_global_item_unref - Drop reference to memory
		* object
		* @ref: Object being removed
		*
		* Drop a reference to the memory object and eventually call the
		* release() hook. The allocated object should be dropped in the
		* release() hook or before calling this function
		*
		*/

		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);
		item->object = NULL;
		}
		mutex_unlock(&item->mutex);
		}
		EXPORT_SYMBOL(drm_global_item_unref);

include/drm/drmP.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@
		#include <drm/drm_agpsupport.h>
		#include <drm/drm_crtc.h>
		#include <drm/drm_fourcc.h>
		#include <drm/drm_global.h>
		#include <drm/drm_hashtab.h>
		#include <drm/drm_mm.h>
		#include <drm/drm_os_linux.h>

include/drm/drm_global.h

deleted100644 → 0

+0 −53

Original line number	Diff line number	Diff line
		/**************************************************************************
		*
		* 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>
		*/

		#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 );
		};

		void drm_global_init(void);
		void drm_global_release(void);
		int drm_global_item_ref(struct drm_global_reference *ref);
		void drm_global_item_unref(struct drm_global_reference *ref);

		#endif