Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7b96070 authored by David Herrmann's avatar David Herrmann
Browse files

drm: mark drm_context support as legacy 



This renames all drm-context helpers to drm_legacy_*() and moves the
internal definitions into the new drm_legacy.h header. This header is
local to DRM-core and drivers shouldn't access it.

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
parent e1728075

drivers/gpu/drm/drm_context.c

+36 −40
Original line number Diff line number Diff line 
/**

 * \file drm_context.c

 * IOCTLs for generic contexts

 *

 * \author Rickard E. (Rik) Faith <faith@valinux.com>

 * \author Gareth Hughes <gareth@valinux.com>

 */



/*

 * Created: Fri Nov 24 18:31:37 2000 by gareth@valinux.com

 * Legacy: Generic DRM Contexts

 *

 * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.

 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.

 * All Rights Reserved.

 *

 * Author: Rickard E. (Rik) Faith <faith@valinux.com>

 * Author: Gareth Hughes <gareth@valinux.com>

 *

 * 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
@@ -33,14 +28,14 @@ 
 * OTHER DEALINGS IN THE SOFTWARE.

 */



/*

 * ChangeLog:

 *  2001-11-16	Torsten Duwe <duwe@caldera.de>

 *		added context constructor/destructor hooks,

 *		needed by SiS driver's memory management.

 */



#include <drm/drmP.h>

#include "drm_legacy.h"



struct drm_ctx_list {

	struct list_head head;

	drm_context_t handle;

	struct drm_file *tag;

};



/******************************************************************/

/** \name Context bitmap support */
@@ -56,7 +51,7 @@ 
 * in drm_device::ctx_idr, while holding the drm_device::struct_mutex

 * lock.

 */

void drm_ctxbitmap_free(struct drm_device * dev, int ctx_handle)

void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle)

{

	mutex_lock(&dev->struct_mutex);

	idr_remove(&dev->ctx_idr, ctx_handle);
@@ -72,7 +67,7 @@ void drm_ctxbitmap_free(struct drm_device * dev, int ctx_handle) 
 * Allocate a new idr from drm_device::ctx_idr while holding the

 * drm_device::struct_mutex lock.

 */

static int drm_ctxbitmap_next(struct drm_device * dev)

static int drm_legacy_ctxbitmap_next(struct drm_device * dev)

{

	int ret;
@@ -90,7 +85,7 @@ static int drm_ctxbitmap_next(struct drm_device * dev) 
 *

 * Initialise the drm_device::ctx_idr

 */

int drm_ctxbitmap_init(struct drm_device * dev)

int drm_legacy_ctxbitmap_init(struct drm_device * dev)

{

	idr_init(&dev->ctx_idr);

	return 0;
@@ -104,7 +99,7 @@ int drm_ctxbitmap_init(struct drm_device * dev) 
 * Free all idr members using drm_ctx_sarea_free helper function

 * while holding the drm_device::struct_mutex lock.

 */

void drm_ctxbitmap_cleanup(struct drm_device * dev)

void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev)

{

	mutex_lock(&dev->struct_mutex);

	idr_destroy(&dev->ctx_idr);
@@ -120,7 +115,7 @@ void drm_ctxbitmap_cleanup(struct drm_device * dev) 
 * @file. Note that after this call returns, new contexts might be added if

 * the file is still alive.

 */

void drm_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file)

void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file)

{

	struct drm_ctx_list *pos, *tmp;
@@ -132,7 +127,7 @@ void drm_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file) 
			if (dev->driver->context_dtor)

				dev->driver->context_dtor(dev, pos->handle);



			drm_ctxbitmap_free(dev, pos->handle);

			drm_legacy_ctxbitmap_free(dev, pos->handle);

			list_del(&pos->head);

			kfree(pos);

		}
@@ -159,7 +154,7 @@ void drm_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file) 
 * Gets the map from drm_device::ctx_idr with the handle specified and

 * returns its handle.

 */

int drm_getsareactx(struct drm_device *dev, void *data,

int drm_legacy_getsareactx(struct drm_device *dev, void *data,

			   struct drm_file *file_priv)

{

	struct drm_ctx_priv_map *request = data;
@@ -203,7 +198,7 @@ int drm_getsareactx(struct drm_device *dev, void *data, 
 * Searches the mapping specified in \p arg and update the entry in

 * drm_device::ctx_idr with it.

 */

int drm_setsareactx(struct drm_device *dev, void *data,

int drm_legacy_setsareactx(struct drm_device *dev, void *data,

			   struct drm_file *file_priv)

{

	struct drm_ctx_priv_map *request = data;
@@ -303,7 +298,7 @@ static int drm_context_switch_complete(struct drm_device *dev, 
 * \param arg user argument pointing to a drm_ctx_res structure.

 * \return zero on success or a negative number on failure.

 */

int drm_resctx(struct drm_device *dev, void *data,

int drm_legacy_resctx(struct drm_device *dev, void *data,

		      struct drm_file *file_priv)

{

	struct drm_ctx_res *res = data;
@@ -334,16 +329,16 @@ int drm_resctx(struct drm_device *dev, void *data, 
 *

 * Get a new handle for the context and copy to userspace.

 */

int drm_addctx(struct drm_device *dev, void *data,

int drm_legacy_addctx(struct drm_device *dev, void *data,

		      struct drm_file *file_priv)

{

	struct drm_ctx_list *ctx_entry;

	struct drm_ctx *ctx = data;



	ctx->handle = drm_ctxbitmap_next(dev);

	ctx->handle = drm_legacy_ctxbitmap_next(dev);

	if (ctx->handle == DRM_KERNEL_CONTEXT) {

		/* Skip kernel's context and get a new one. */

		ctx->handle = drm_ctxbitmap_next(dev);

		ctx->handle = drm_legacy_ctxbitmap_next(dev);

	}

	DRM_DEBUG("%d\n", ctx->handle);

	if (ctx->handle == -1) {
@@ -378,7 +373,8 @@ int drm_addctx(struct drm_device *dev, void *data, 
 * \param arg user argument pointing to a drm_ctx structure.

 * \return zero on success or a negative number on failure.

 */

int drm_getctx(struct drm_device *dev, void *data, struct drm_file *file_priv)

int drm_legacy_getctx(struct drm_device *dev, void *data,

		      struct drm_file *file_priv)

{

	struct drm_ctx *ctx = data;
@@ -399,7 +395,7 @@ int drm_getctx(struct drm_device *dev, void *data, struct drm_file *file_priv) 
 *

 * Calls context_switch().

 */

int drm_switchctx(struct drm_device *dev, void *data,

int drm_legacy_switchctx(struct drm_device *dev, void *data,

			 struct drm_file *file_priv)

{

	struct drm_ctx *ctx = data;
@@ -419,7 +415,7 @@ int drm_switchctx(struct drm_device *dev, void *data, 
 *

 * Calls context_switch_complete().

 */

int drm_newctx(struct drm_device *dev, void *data,

int drm_legacy_newctx(struct drm_device *dev, void *data,

		      struct drm_file *file_priv)

{

	struct drm_ctx *ctx = data;
@@ -441,7 +437,7 @@ int drm_newctx(struct drm_device *dev, void *data, 
 *

 * If not the special kernel context, calls ctxbitmap_free() to free the specified context.

 */

int drm_rmctx(struct drm_device *dev, void *data,

int drm_legacy_rmctx(struct drm_device *dev, void *data,

		     struct drm_file *file_priv)

{

	struct drm_ctx *ctx = data;
@@ -450,7 +446,7 @@ int drm_rmctx(struct drm_device *dev, void *data, 
	if (ctx->handle != DRM_KERNEL_CONTEXT) {

		if (dev->driver->context_dtor)

			dev->driver->context_dtor(dev, ctx->handle);

		drm_ctxbitmap_free(dev, ctx->handle);

		drm_legacy_ctxbitmap_free(dev, ctx->handle);

	}



	mutex_lock(&dev->ctxlist_mutex);

drivers/gpu/drm/drm_fops.c

+2 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/poll.h>

#include <linux/slab.h>

#include <linux/module.h>

#include "drm_legacy.h"



/* from BKL pushdown */

DEFINE_MUTEX(drm_global_mutex);
@@ -416,7 +417,7 @@ int drm_release(struct inode *inode, struct file *filp) 
	if (dev->driver->driver_features & DRIVER_GEM)

		drm_gem_release(dev, file_priv);



	drm_ctxbitmap_flush(dev, file_priv);

	drm_legacy_ctxbitmap_flush(dev, file_priv);



	mutex_lock(&dev->master_mutex);

drivers/gpu/drm/drm_ioctl.c

+9 −8
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


#include <drm/drmP.h>

#include <drm/drm_core.h>

#include "drm_legacy.h"



#include <linux/pci.h>

#include <linux/export.h>
@@ -64,19 +65,19 @@ static const struct drm_ioctl_desc drm_ioctls[] = { 
	DRM_IOCTL_DEF(DRM_IOCTL_ADD_MAP, drm_addmap_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_RM_MAP, drm_rmmap_ioctl, DRM_AUTH),



	DRM_IOCTL_DEF(DRM_IOCTL_SET_SAREA_CTX, drm_setsareactx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_GET_SAREA_CTX, drm_getsareactx, DRM_AUTH),

	DRM_IOCTL_DEF(DRM_IOCTL_SET_SAREA_CTX, drm_legacy_setsareactx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_GET_SAREA_CTX, drm_legacy_getsareactx, DRM_AUTH),



	DRM_IOCTL_DEF(DRM_IOCTL_SET_MASTER, drm_setmaster_ioctl, DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_DROP_MASTER, drm_dropmaster_ioctl, DRM_ROOT_ONLY),



	DRM_IOCTL_DEF(DRM_IOCTL_ADD_CTX, drm_addctx, DRM_AUTH|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_RM_CTX, drm_rmctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_ADD_CTX, drm_legacy_addctx, DRM_AUTH|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_RM_CTX, drm_legacy_rmctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_MOD_CTX, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_GET_CTX, drm_getctx, DRM_AUTH),

	DRM_IOCTL_DEF(DRM_IOCTL_SWITCH_CTX, drm_switchctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_NEW_CTX, drm_newctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_RES_CTX, drm_resctx, DRM_AUTH),

	DRM_IOCTL_DEF(DRM_IOCTL_GET_CTX, drm_legacy_getctx, DRM_AUTH),

	DRM_IOCTL_DEF(DRM_IOCTL_SWITCH_CTX, drm_legacy_switchctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_NEW_CTX, drm_legacy_newctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_RES_CTX, drm_legacy_resctx, DRM_AUTH),



	DRM_IOCTL_DEF(DRM_IOCTL_ADD_DRAW, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_RM_DRAW, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

drivers/gpu/drm/drm_legacy.h

0 → 100644
+51 −0
Original line number Diff line number Diff line 
#ifndef __DRM_LEGACY_H__

#define __DRM_LEGACY_H__



/*

 * Copyright (c) 2014 David Herrmann <dh.herrmann@gmail.com>

 *

 * 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, sublicense,

 * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.

 */



struct drm_device;

struct drm_file;



/*

 * Generic DRM Contexts

 */



#define DRM_KERNEL_CONTEXT		0

#define DRM_RESERVED_CONTEXTS		1



int drm_legacy_ctxbitmap_init(struct drm_device *dev);

void drm_legacy_ctxbitmap_cleanup(struct drm_device *dev);

void drm_legacy_ctxbitmap_free(struct drm_device *dev, int ctx_handle);

void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file);



int drm_legacy_resctx(struct drm_device *d, void *v, struct drm_file *f);

int drm_legacy_addctx(struct drm_device *d, void *v, struct drm_file *f);

int drm_legacy_getctx(struct drm_device *d, void *v, struct drm_file *f);

int drm_legacy_switchctx(struct drm_device *d, void *v, struct drm_file *f);

int drm_legacy_newctx(struct drm_device *d, void *v, struct drm_file *f);

int drm_legacy_rmctx(struct drm_device *d, void *v, struct drm_file *f);



int drm_legacy_setsareactx(struct drm_device *d, void *v, struct drm_file *f);

int drm_legacy_getsareactx(struct drm_device *d, void *v, struct drm_file *f);



#endif /* __DRM_LEGACY_H__ */

drivers/gpu/drm/drm_lock.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 


#include <linux/export.h>

#include <drm/drmP.h>

#include "drm_legacy.h"



static int drm_notifier(void *priv);