Commit 04dfe19a authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm: Mark AGP implementation and ioctls as legacy 



Only UMs drivers use DRM's core AGP code and ioctls. Mark the icotls
as legacy. Add the _legacy_ infix to all AGP functions. Move the
declarations to the public and internal legacy header files. The agp
field in struct drm_device is now located in the structure's legacy
section. Adapt drivers to the changes.

AGP code now depends on CONFIG_DRM_LEGACY.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210507185709.22797-5-tzimmermann@suse.de
parent 6bff2279

drivers/gpu/drm/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -20,15 +20,15 @@ drm-y := drm_aperture.o drm_auth.o drm_cache.o \ 
		drm_client_modeset.o drm_atomic_uapi.o drm_hdcp.o \

		drm_managed.o drm_vblank_work.o



drm-$(CONFIG_DRM_LEGACY) += drm_bufs.o drm_context.o drm_dma.o drm_legacy_misc.o drm_lock.o \

		drm_memory.o drm_scatter.o drm_vm.o

drm-$(CONFIG_DRM_LEGACY) += drm_agpsupport.o drm_bufs.o drm_context.o drm_dma.o \

			    drm_legacy_misc.o drm_lock.o drm_memory.o drm_scatter.o \

			    drm_vm.o

drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o

drm-$(CONFIG_COMPAT) += drm_ioc32.o

drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o

drm-$(CONFIG_DRM_GEM_SHMEM_HELPER) += drm_gem_shmem_helper.o

drm-$(CONFIG_DRM_PANEL) += drm_panel.o

drm-$(CONFIG_OF) += drm_of.o

drm-$(CONFIG_AGP) += drm_agpsupport.o

drm-$(CONFIG_PCI) += drm_pci.o

drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o

drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o

drivers/gpu/drm/drm_agpsupport.c

+51 −48
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 


#include <asm/agp.h>



#include <drm/drm_agpsupport.h>

#include <drm/drm_device.h>

#include <drm/drm_drv.h>

#include <drm/drm_file.h>
@@ -45,6 +44,8 @@ 


#include "drm_legacy.h"



#if IS_ENABLED(CONFIG_AGP)



/*

 * Get AGP information.

 *
@@ -53,7 +54,7 @@ 
 * Verifies the AGP device has been initialized and acquired and fills in the

 * drm_agp_info structure with the information in drm_agp_head::agp_info.

 */

int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info)

int drm_legacy_agp_info(struct drm_device *dev, struct drm_agp_info *info)

{

	struct agp_kern_info *kern;
@@ -73,15 +74,15 @@ int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info) 


	return 0;

}

EXPORT_SYMBOL(drm_agp_info);

EXPORT_SYMBOL(drm_legacy_agp_info);



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

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

			      struct drm_file *file_priv)

{

	struct drm_agp_info *info = data;

	int err;



	err = drm_agp_info(dev, info);

	err = drm_legacy_agp_info(dev, info);

	if (err)

		return err;
@@ -97,7 +98,7 @@ int drm_agp_info_ioctl(struct drm_device *dev, void *data, 
 * Verifies the AGP device hasn't been acquired before and calls

 * \c agp_backend_acquire.

 */

int drm_agp_acquire(struct drm_device *dev)

int drm_legacy_agp_acquire(struct drm_device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev->dev);
@@ -111,7 +112,7 @@ int drm_agp_acquire(struct drm_device *dev) 
	dev->agp->acquired = 1;

	return 0;

}

EXPORT_SYMBOL(drm_agp_acquire);

EXPORT_SYMBOL(drm_legacy_agp_acquire);



/*

 * Acquire the AGP device (ioctl).
@@ -121,10 +122,10 @@ EXPORT_SYMBOL(drm_agp_acquire); 
 * Verifies the AGP device hasn't been acquired before and calls

 * \c agp_backend_acquire.

 */

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

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

				 struct drm_file *file_priv)

{

	return drm_agp_acquire((struct drm_device *) file_priv->minor->dev);

	return drm_legacy_agp_acquire((struct drm_device *)file_priv->minor->dev);

}



/*
@@ -135,7 +136,7 @@ int drm_agp_acquire_ioctl(struct drm_device *dev, void *data, 
 *

 * Verifies the AGP device has been acquired and calls \c agp_backend_release.

 */

int drm_agp_release(struct drm_device *dev)

int drm_legacy_agp_release(struct drm_device *dev)

{

	if (!dev->agp || !dev->agp->acquired)

		return -EINVAL;
@@ -143,12 +144,12 @@ int drm_agp_release(struct drm_device *dev) 
	dev->agp->acquired = 0;

	return 0;

}

EXPORT_SYMBOL(drm_agp_release);

EXPORT_SYMBOL(drm_legacy_agp_release);



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

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

				 struct drm_file *file_priv)

{

	return drm_agp_release(dev);

	return drm_legacy_agp_release(dev);

}



/*
@@ -161,7 +162,7 @@ int drm_agp_release_ioctl(struct drm_device *dev, void *data, 
 * Verifies the AGP device has been acquired but not enabled, and calls

 * \c agp_enable.

 */

int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode)

int drm_legacy_agp_enable(struct drm_device *dev, struct drm_agp_mode mode)

{

	if (!dev->agp || !dev->agp->acquired)

		return -EINVAL;
@@ -171,14 +172,14 @@ int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode) 
	dev->agp->enabled = 1;

	return 0;

}

EXPORT_SYMBOL(drm_agp_enable);

EXPORT_SYMBOL(drm_legacy_agp_enable);



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

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

				struct drm_file *file_priv)

{

	struct drm_agp_mode *mode = data;



	return drm_agp_enable(dev, *mode);

	return drm_legacy_agp_enable(dev, *mode);

}



/*
@@ -189,7 +190,7 @@ int drm_agp_enable_ioctl(struct drm_device *dev, void *data, 
 * Verifies the AGP device is present and has been acquired, allocates the

 * memory via agp_allocate_memory() and creates a drm_agp_mem entry for it.

 */

int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)

int drm_legacy_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request)

{

	struct drm_agp_mem *entry;

	struct agp_memory *memory;
@@ -221,15 +222,15 @@ int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request) 


	return 0;

}

EXPORT_SYMBOL(drm_agp_alloc);

EXPORT_SYMBOL(drm_legacy_agp_alloc);





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

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

			struct drm_file *file_priv)

{

	struct drm_agp_buffer *request = data;



	return drm_agp_alloc(dev, request);

	return drm_legacy_agp_alloc(dev, request);

}



/*
@@ -241,7 +242,7 @@ int drm_agp_alloc_ioctl(struct drm_device *dev, void *data, 
 *

 * Walks through drm_agp_head::memory until finding a matching handle.

 */

static struct drm_agp_mem *drm_agp_lookup_entry(struct drm_device *dev,

static struct drm_agp_mem *drm_legacy_agp_lookup_entry(struct drm_device *dev,

						       unsigned long handle)

{

	struct drm_agp_mem *entry;
@@ -261,14 +262,14 @@ static struct drm_agp_mem *drm_agp_lookup_entry(struct drm_device *dev, 
 * Verifies the AGP device is present and acquired, looks-up the AGP memory

 * entry and passes it to the unbind_agp() function.

 */

int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request)

int drm_legacy_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request)

{

	struct drm_agp_mem *entry;

	int ret;



	if (!dev->agp || !dev->agp->acquired)

		return -EINVAL;

	entry = drm_agp_lookup_entry(dev, request->handle);

	entry = drm_legacy_agp_lookup_entry(dev, request->handle);

	if (!entry || !entry->bound)

		return -EINVAL;

	ret = agp_unbind_memory(entry->memory);
@@ -276,15 +277,15 @@ int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request) 
		entry->bound = 0;

	return ret;

}

EXPORT_SYMBOL(drm_agp_unbind);

EXPORT_SYMBOL(drm_legacy_agp_unbind);





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

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

				struct drm_file *file_priv)

{

	struct drm_agp_binding *request = data;



	return drm_agp_unbind(dev, request);

	return drm_legacy_agp_unbind(dev, request);

}



/*
@@ -296,7 +297,7 @@ int drm_agp_unbind_ioctl(struct drm_device *dev, void *data, 
 * is currently bound into the GATT. Looks-up the AGP memory entry and passes

 * it to bind_agp() function.

 */

int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request)

int drm_legacy_agp_bind(struct drm_device *dev, struct drm_agp_binding *request)

{

	struct drm_agp_mem *entry;

	int retcode;
@@ -304,7 +305,7 @@ int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request) 


	if (!dev->agp || !dev->agp->acquired)

		return -EINVAL;

	entry = drm_agp_lookup_entry(dev, request->handle);

	entry = drm_legacy_agp_lookup_entry(dev, request->handle);

	if (!entry || entry->bound)

		return -EINVAL;

	page = DIV_ROUND_UP(request->offset, PAGE_SIZE);
@@ -316,15 +317,15 @@ int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request) 
		  dev->agp->base, entry->bound);

	return 0;

}

EXPORT_SYMBOL(drm_agp_bind);

EXPORT_SYMBOL(drm_legacy_agp_bind);





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

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

			      struct drm_file *file_priv)

{

	struct drm_agp_binding *request = data;



	return drm_agp_bind(dev, request);

	return drm_legacy_agp_bind(dev, request);

}



/*
@@ -337,13 +338,13 @@ int drm_agp_bind_ioctl(struct drm_device *dev, void *data, 
 * unbind_agp(). Frees it via free_agp() as well as the entry itself

 * and unlinks from the doubly linked list it's inserted in.

 */

int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request)

int drm_legacy_agp_free(struct drm_device *dev, struct drm_agp_buffer *request)

{

	struct drm_agp_mem *entry;



	if (!dev->agp || !dev->agp->acquired)

		return -EINVAL;

	entry = drm_agp_lookup_entry(dev, request->handle);

	entry = drm_legacy_agp_lookup_entry(dev, request->handle);

	if (!entry)

		return -EINVAL;

	if (entry->bound)
@@ -355,15 +356,15 @@ int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request) 
	kfree(entry);

	return 0;

}

EXPORT_SYMBOL(drm_agp_free);

EXPORT_SYMBOL(drm_legacy_agp_free);





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

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

			      struct drm_file *file_priv)

{

	struct drm_agp_buffer *request = data;



	return drm_agp_free(dev, request);

	return drm_legacy_agp_free(dev, request);

}



/*
@@ -378,7 +379,7 @@ int drm_agp_free_ioctl(struct drm_device *dev, void *data, 
 * Note that final cleanup of the kmalloced structure is directly done in

 * drm_pci_agp_destroy.

 */

struct drm_agp_head *drm_agp_init(struct drm_device *dev)

struct drm_agp_head *drm_legacy_agp_init(struct drm_device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	struct drm_agp_head *head = NULL;
@@ -409,7 +410,7 @@ struct drm_agp_head *drm_agp_init(struct drm_device *dev) 
	return head;

}

/* Only exported for i810.ko */

EXPORT_SYMBOL(drm_agp_init);

EXPORT_SYMBOL(drm_legacy_agp_init);



/**

 * drm_legacy_agp_clear - Clear AGP resource list
@@ -439,8 +440,10 @@ void drm_legacy_agp_clear(struct drm_device *dev) 
	INIT_LIST_HEAD(&dev->agp->memory);



	if (dev->agp->acquired)

		drm_agp_release(dev);

		drm_legacy_agp_release(dev);



	dev->agp->acquired = 0;

	dev->agp->enabled = 0;

}



#endif

drivers/gpu/drm/drm_bufs.c

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


#include <asm/shmparam.h>



#include <drm/drm_agpsupport.h>

#include <drm/drm_device.h>

#include <drm/drm_drv.h>

#include <drm/drm_file.h>

drivers/gpu/drm/drm_ioc32.c

+9 −10
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/ratelimit.h>

#include <linux/export.h>



#include <drm/drm_agpsupport.h>

#include <drm/drm_file.h>

#include <drm/drm_print.h>
@@ -619,6 +618,7 @@ static int compat_drm_dma(struct file *file, unsigned int cmd, 
}

#endif



#if IS_ENABLED(CONFIG_DRM_LEGACY)

#if IS_ENABLED(CONFIG_AGP)

typedef struct drm_agp_mode32 {

	u32 mode;	/**< AGP mode */
@@ -633,7 +633,7 @@ static int compat_drm_agp_enable(struct file *file, unsigned int cmd, 
	if (get_user(mode.mode, &argp->mode))

		return -EFAULT;



	return drm_ioctl_kernel(file,  drm_agp_enable_ioctl, &mode,

	return drm_ioctl_kernel(file,  drm_legacy_agp_enable_ioctl, &mode,

				DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY);

}
@@ -659,7 +659,7 @@ static int compat_drm_agp_info(struct file *file, unsigned int cmd, 
	struct drm_agp_info info;

	int err;



	err = drm_ioctl_kernel(file, drm_agp_info_ioctl, &info, DRM_AUTH);

	err = drm_ioctl_kernel(file, drm_legacy_agp_info_ioctl, &info, DRM_AUTH);

	if (err)

		return err;
@@ -698,7 +698,7 @@ static int compat_drm_agp_alloc(struct file *file, unsigned int cmd, 


	request.size = req32.size;

	request.type = req32.type;

	err = drm_ioctl_kernel(file, drm_agp_alloc_ioctl, &request,

	err = drm_ioctl_kernel(file, drm_legacy_agp_alloc_ioctl, &request,

				DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY);

	if (err)

		return err;
@@ -706,7 +706,7 @@ static int compat_drm_agp_alloc(struct file *file, unsigned int cmd, 
	req32.handle = request.handle;

	req32.physical = request.physical;

	if (copy_to_user(argp, &req32, sizeof(req32))) {

		drm_ioctl_kernel(file, drm_agp_free_ioctl, &request,

		drm_ioctl_kernel(file, drm_legacy_agp_free_ioctl, &request,

				DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY);

		return -EFAULT;

	}
@@ -723,7 +723,7 @@ static int compat_drm_agp_free(struct file *file, unsigned int cmd, 
	if (get_user(request.handle, &argp->handle))

		return -EFAULT;



	return drm_ioctl_kernel(file, drm_agp_free_ioctl, &request,

	return drm_ioctl_kernel(file, drm_legacy_agp_free_ioctl, &request,

				DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY);

}
@@ -744,7 +744,7 @@ static int compat_drm_agp_bind(struct file *file, unsigned int cmd, 


	request.handle = req32.handle;

	request.offset = req32.offset;

	return drm_ioctl_kernel(file, drm_agp_bind_ioctl, &request,

	return drm_ioctl_kernel(file, drm_legacy_agp_bind_ioctl, &request,

				DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY);

}
@@ -757,12 +757,11 @@ static int compat_drm_agp_unbind(struct file *file, unsigned int cmd, 
	if (get_user(request.handle, &argp->handle))

		return -EFAULT;



	return drm_ioctl_kernel(file, drm_agp_unbind_ioctl, &request,

	return drm_ioctl_kernel(file, drm_legacy_agp_unbind_ioctl, &request,

				DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY);

}

#endif /* CONFIG_AGP */



#if IS_ENABLED(CONFIG_DRM_LEGACY)

typedef struct drm_scatter_gather32 {

	u32 size;	/**< In bytes -- will round to page boundary */

	u32 handle;	/**< Used for mapping / unmapping */
@@ -935,7 +934,6 @@ static struct { 
	DRM_IOCTL32_DEF(DRM_IOCTL_GET_SAREA_CTX, compat_drm_getsareactx),

	DRM_IOCTL32_DEF(DRM_IOCTL_RES_CTX, compat_drm_resctx),

	DRM_IOCTL32_DEF(DRM_IOCTL_DMA, compat_drm_dma),

#endif

#if IS_ENABLED(CONFIG_AGP)

	DRM_IOCTL32_DEF(DRM_IOCTL_AGP_ENABLE, compat_drm_agp_enable),

	DRM_IOCTL32_DEF(DRM_IOCTL_AGP_INFO, compat_drm_agp_info),
@@ -944,6 +942,7 @@ static struct { 
	DRM_IOCTL32_DEF(DRM_IOCTL_AGP_BIND, compat_drm_agp_bind),

	DRM_IOCTL32_DEF(DRM_IOCTL_AGP_UNBIND, compat_drm_agp_unbind),

#endif

#endif

#if IS_ENABLED(CONFIG_DRM_LEGACY)

	DRM_IOCTL32_DEF(DRM_IOCTL_SG_ALLOC, compat_drm_sg_alloc),

	DRM_IOCTL32_DEF(DRM_IOCTL_SG_FREE, compat_drm_sg_free),

drivers/gpu/drm/drm_ioctl.c

+15 −9
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <linux/pci.h>

#include <linux/uaccess.h>



#include <drm/drm_agpsupport.h>

#include <drm/drm_auth.h>

#include <drm/drm_crtc.h>

#include <drm/drm_drv.h>
@@ -627,14 +626,21 @@ static const struct drm_ioctl_desc drm_ioctls[] = { 
	DRM_LEGACY_IOCTL_DEF(DRM_IOCTL_CONTROL, drm_legacy_irq_control, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),



#if IS_ENABLED(CONFIG_AGP)

	DRM_IOCTL_DEF(DRM_IOCTL_AGP_ACQUIRE, drm_agp_acquire_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_AGP_RELEASE, drm_agp_release_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_AGP_ENABLE, drm_agp_enable_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_AGP_INFO, drm_agp_info_ioctl, DRM_AUTH),

	DRM_IOCTL_DEF(DRM_IOCTL_AGP_ALLOC, drm_agp_alloc_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_AGP_FREE, drm_agp_free_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_AGP_BIND, drm_agp_bind_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_AGP_UNBIND, drm_agp_unbind_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_LEGACY_IOCTL_DEF(DRM_IOCTL_AGP_ACQUIRE, drm_legacy_agp_acquire_ioctl,

			     DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_LEGACY_IOCTL_DEF(DRM_IOCTL_AGP_RELEASE, drm_legacy_agp_release_ioctl,

			     DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_LEGACY_IOCTL_DEF(DRM_IOCTL_AGP_ENABLE, drm_legacy_agp_enable_ioctl,

			     DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_LEGACY_IOCTL_DEF(DRM_IOCTL_AGP_INFO, drm_legacy_agp_info_ioctl, DRM_AUTH),

	DRM_LEGACY_IOCTL_DEF(DRM_IOCTL_AGP_ALLOC, drm_legacy_agp_alloc_ioctl,

			     DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_LEGACY_IOCTL_DEF(DRM_IOCTL_AGP_FREE, drm_legacy_agp_free_ioctl,

			     DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_LEGACY_IOCTL_DEF(DRM_IOCTL_AGP_BIND, drm_legacy_agp_bind_ioctl,

			     DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_LEGACY_IOCTL_DEF(DRM_IOCTL_AGP_UNBIND, drm_legacy_agp_unbind_ioctl,

			     DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

#endif



	DRM_LEGACY_IOCTL_DEF(DRM_IOCTL_SG_ALLOC, drm_legacy_sg_alloc, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),