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

Commit e4fa8457 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/prime: Align gem_prime_export with obj_funcs.export 



The idea is that gem_prime_export is deprecated in favor of
obj_funcs.export. That's much easier to do if both have matching
function signatures.

Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: Zhi Wang <zhi.a.wang@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: "Michel Dänzer" <michel.daenzer@amd.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Huang Rui <ray.huang@amd.com>
Cc: Felix Kuehling <Felix.Kuehling@amd.com>
Cc: Hawking Zhang <Hawking.Zhang@amd.com>
Cc: Feifei Xu <Feifei.Xu@amd.com>
Cc: Jim Qu <Jim.Qu@amd.com>
Cc: Evan Quan <evan.quan@amd.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Thomas Zimmermann <tdz@users.sourceforge.net>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Jilayne Lovejoy <opensource@jilayne.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Junwei Zhang <Jerry.Zhang@amd.com>
Cc: intel-gvt-dev@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Cc: linux-tegra@vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190614203615.12639-10-daniel.vetter@ffwll.ch
parent 8b3026a7

drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

+3 −4
Original line number Diff line number Diff line
@@ -345,8 +345,7 @@ const struct dma_buf_ops amdgpu_dmabuf_ops = { 
 * Returns:

 * Shared DMA buffer representing the GEM BO from the given device.

 */

struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev,

					struct drm_gem_object *gobj,

struct dma_buf *amdgpu_gem_prime_export(struct drm_gem_object *gobj,

					int flags)

{

	struct amdgpu_bo *bo = gem_to_amdgpu_bo(gobj);
@@ -356,9 +355,9 @@ struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, 
	    bo->flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID)

		return ERR_PTR(-EPERM);



	buf = drm_gem_prime_export(dev, gobj, flags);

	buf = drm_gem_prime_export(gobj, flags);

	if (!IS_ERR(buf)) {

		buf->file->f_mapping = dev->anon_inode->i_mapping;

		buf->file->f_mapping = gobj->dev->anon_inode->i_mapping;

		buf->ops = &amdgpu_dmabuf_ops;

	}

drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h

+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ struct drm_gem_object * 
amdgpu_gem_prime_import_sg_table(struct drm_device *dev,

				 struct dma_buf_attachment *attach,

				 struct sg_table *sg);

struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev,

					struct drm_gem_object *gobj,

struct dma_buf *amdgpu_gem_prime_export(struct drm_gem_object *gobj,

					int flags);

struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev,

					    struct dma_buf *dma_buf);

drivers/gpu/drm/armada/armada_gem.c

+2 −3
Original line number Diff line number Diff line
@@ -485,8 +485,7 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = { 
};



struct dma_buf *

armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj,

	int flags)

armada_gem_prime_export(struct drm_gem_object *obj, int flags)

{

	DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
@@ -495,7 +494,7 @@ armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, 
	exp_info.flags = O_RDWR;

	exp_info.priv = obj;



	return drm_gem_dmabuf_export(dev, &exp_info);

	return drm_gem_dmabuf_export(obj->dev, &exp_info);

}



struct drm_gem_object *

drivers/gpu/drm/armada/armada_gem.h

+1 −2
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ struct armada_gem_object *armada_gem_alloc_private_object(struct drm_device *, 
	size_t);

int armada_gem_dumb_create(struct drm_file *, struct drm_device *,

	struct drm_mode_create_dumb *);

struct dma_buf *armada_gem_prime_export(struct drm_device *dev,

	struct drm_gem_object *obj, int flags);

struct dma_buf *armada_gem_prime_export(struct drm_gem_object *obj, int flags);

struct drm_gem_object *armada_gem_prime_import(struct drm_device *,

	struct dma_buf *);

int armada_gem_map_import(struct armada_gem_object *);

drivers/gpu/drm/drm_prime.c

+4 −5
Original line number Diff line number Diff line
@@ -384,9 +384,9 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev, 
	if (obj->funcs && obj->funcs->export)

		dmabuf = obj->funcs->export(obj, flags);

	else if (dev->driver->gem_prime_export)

		dmabuf = dev->driver->gem_prime_export(dev, obj, flags);

		dmabuf = dev->driver->gem_prime_export(obj, flags);

	else

		dmabuf = drm_gem_prime_export(dev, obj, flags);

		dmabuf = drm_gem_prime_export(obj, flags);

	if (IS_ERR(dmabuf)) {

		/* normally the created dma-buf takes ownership of the ref,

		 * but if that fails then drop the ref
@@ -814,7 +814,6 @@ EXPORT_SYMBOL(drm_prime_pages_to_sg); 


/**

 * drm_gem_prime_export - helper library implementation of the export callback

 * @dev: drm_device to export from

 * @obj: GEM object to export

 * @flags: flags like DRM_CLOEXEC and DRM_RDWR

 *
@@ -822,10 +821,10 @@ EXPORT_SYMBOL(drm_prime_pages_to_sg); 
 * using the PRIME helpers. It is used as the default in

 * drm_gem_prime_handle_to_fd().

 */

struct dma_buf *drm_gem_prime_export(struct drm_device *dev,

				     struct drm_gem_object *obj,

struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj,

				     int flags)

{

	struct drm_device *dev = obj->dev;

	struct dma_buf_export_info exp_info = {

		.exp_name = KBUILD_MODNAME, /* white lie for debug */

		.owner = dev->driver->fops->owner,