drm/vgem: drop DRIVER_PRIME (v2) (990ed272) · Commits · 戴 / test

drivers/gpu/drm/vgem/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	ccflags-y := -Iinclude/drm		ccflags-y := -Iinclude/drm
	vgem-y := vgem_drv.o vgem_dma_buf.o		vgem-y := vgem_drv.o

	obj-$(CONFIG_DRM_VGEM) += vgem.o		obj-$(CONFIG_DRM_VGEM) += vgem.o

drivers/gpu/drm/vgem/vgem_dma_buf.c

deleted100644 → 0

+0 −94

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright © 2012 Intel Corporation
	* Copyright © 2014 The Chromium OS Authors
	*
	* 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 (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 NONINFRINGEMENT. IN NO EVENT SHALL
	* THE AUTHORS OR COPYRIGHT HOLDERS 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:
	* Ben Widawsky <ben@bwidawsk.net>
	*
	*/

	#include <linux/dma-buf.h>
	#include "vgem_drv.h"

	struct sg_table vgem_gem_prime_get_sg_table(struct drm_gem_object gobj)
	{
	struct drm_vgem_gem_object *obj = to_vgem_bo(gobj);
	BUG_ON(obj->pages == NULL);

	return drm_prime_pages_to_sg(obj->pages, obj->base.size / PAGE_SIZE);
	}

	int vgem_gem_prime_pin(struct drm_gem_object *gobj)
	{
	struct drm_vgem_gem_object *obj = to_vgem_bo(gobj);
	return vgem_gem_get_pages(obj);
	}

	void vgem_gem_prime_unpin(struct drm_gem_object *gobj)
	{
	struct drm_vgem_gem_object *obj = to_vgem_bo(gobj);
	vgem_gem_put_pages(obj);
	}

	void vgem_gem_prime_vmap(struct drm_gem_object gobj)
	{
	struct drm_vgem_gem_object *obj = to_vgem_bo(gobj);
	BUG_ON(obj->pages == NULL);

	return vmap(obj->pages, obj->base.size / PAGE_SIZE, 0, PAGE_KERNEL);
	}

	void vgem_gem_prime_vunmap(struct drm_gem_object obj, void vaddr)
	{
	vunmap(vaddr);
	}

	struct drm_gem_object vgem_gem_prime_import(struct drm_device dev,
	struct dma_buf *dma_buf)
	{
	struct drm_vgem_gem_object *obj = NULL;
	int ret;

	obj = kzalloc(sizeof(*obj), GFP_KERNEL);
	if (obj == NULL) {
	ret = -ENOMEM;
	goto fail;
	}

	ret = drm_gem_object_init(dev, &obj->base, dma_buf->size);
	if (ret) {
	ret = -ENOMEM;
	goto fail_free;
	}

	get_dma_buf(dma_buf);

	obj->base.dma_buf = dma_buf;
	obj->use_dma_buf = true;

	return &obj->base;

	fail_free:
	kfree(obj);
	fail:
	return ERR_PTR(ret);
	}

drivers/gpu/drm/vgem/vgem_drv.c

+1 −10

Original line number	Original line	Diff line number	Diff line
	@@ -302,22 +302,13 @@ static const struct file_operations vgem_driver_fops = {
	};		};

	static struct drm_driver vgem_driver = {		static struct drm_driver vgem_driver = {
	.driver_features = DRIVER_GEM \| DRIVER_PRIME,		.driver_features = DRIVER_GEM,
	.gem_free_object = vgem_gem_free_object,		.gem_free_object = vgem_gem_free_object,
	.gem_vm_ops = &vgem_gem_vm_ops,		.gem_vm_ops = &vgem_gem_vm_ops,
	.ioctls = vgem_ioctls,		.ioctls = vgem_ioctls,
	.fops = &vgem_driver_fops,		.fops = &vgem_driver_fops,
	.dumb_create = vgem_gem_dumb_create,		.dumb_create = vgem_gem_dumb_create,
	.dumb_map_offset = vgem_gem_dumb_map,		.dumb_map_offset = vgem_gem_dumb_map,
	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
	.gem_prime_export = drm_gem_prime_export,
	.gem_prime_import = vgem_gem_prime_import,
	.gem_prime_pin = vgem_gem_prime_pin,
	.gem_prime_unpin = vgem_gem_prime_unpin,
	.gem_prime_get_sg_table = vgem_gem_prime_get_sg_table,
	.gem_prime_vmap = vgem_gem_prime_vmap,
	.gem_prime_vunmap = vgem_gem_prime_vunmap,
	.name = DRIVER_NAME,		.name = DRIVER_NAME,
	.desc = DRIVER_DESC,		.desc = DRIVER_DESC,
	.date = DRIVER_DATE,		.date = DRIVER_DATE,

drivers/gpu/drm/vgem/vgem_drv.h

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -43,15 +43,4 @@ struct drm_vgem_gem_object {
	extern void vgem_gem_put_pages(struct drm_vgem_gem_object *obj);		extern void vgem_gem_put_pages(struct drm_vgem_gem_object *obj);
	extern int vgem_gem_get_pages(struct drm_vgem_gem_object *obj);		extern int vgem_gem_get_pages(struct drm_vgem_gem_object *obj);

	/* vgem_dma_buf.c */
	extern struct sg_table *vgem_gem_prime_get_sg_table(
	struct drm_gem_object *gobj);
	extern int vgem_gem_prime_pin(struct drm_gem_object *gobj);
	extern void vgem_gem_prime_unpin(struct drm_gem_object *gobj);
	extern void vgem_gem_prime_vmap(struct drm_gem_object gobj);
	extern void vgem_gem_prime_vunmap(struct drm_gem_object obj, void vaddr);
	extern struct drm_gem_object vgem_gem_prime_import(struct drm_device dev,
	struct dma_buf *dma_buf);


	#endif		#endif

Admin message