Unverified Commit 4ebad855 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3958 Revert "drm/prime: Unexport helpers for fd/handle conversion" 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Haixiang <chenhaixiang3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/VM5KBVES52HQ5PRA55TSKRTXUCUKGMIJ/ 
 
https://gitee.com/openeuler/kernel/issues/I8VGWZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/3958

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents f3f79f63 84752ad4

drivers/gpu/drm/drm_prime.c

+18 −15
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ void drm_gem_dmabuf_release(struct dma_buf *dma_buf) 
}

EXPORT_SYMBOL(drm_gem_dmabuf_release);



/*

/**

 * drm_gem_prime_fd_to_handle - PRIME import function for GEM drivers

 * @dev: drm_device to import into

 * @file_priv: drm file-private structure
@@ -292,7 +292,7 @@ EXPORT_SYMBOL(drm_gem_dmabuf_release); 
 *

 * Returns 0 on success or a negative error code on failure.

 */

static int drm_gem_prime_fd_to_handle(struct drm_device *dev,

int drm_gem_prime_fd_to_handle(struct drm_device *dev,

			       struct drm_file *file_priv, int prime_fd,

			       uint32_t *handle)

{
@@ -360,6 +360,7 @@ static int drm_gem_prime_fd_to_handle(struct drm_device *dev, 
	dma_buf_put(dma_buf);

	return ret;

}

EXPORT_SYMBOL(drm_gem_prime_fd_to_handle);



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

				 struct drm_file *file_priv)
@@ -408,7 +409,7 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev, 
	return dmabuf;

}



/*

/**

 * drm_gem_prime_handle_to_fd - PRIME export function for GEM drivers

 * @dev: dev to export the buffer from

 * @file_priv: drm file-private structure
@@ -421,7 +422,7 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev, 
 * The actual exporting from GEM object to a dma-buf is done through the

 * &drm_gem_object_funcs.export callback.

 */

static int drm_gem_prime_handle_to_fd(struct drm_device *dev,

int drm_gem_prime_handle_to_fd(struct drm_device *dev,

			       struct drm_file *file_priv, uint32_t handle,

			       uint32_t flags,

			       int *prime_fd)
@@ -506,6 +507,7 @@ static int drm_gem_prime_handle_to_fd(struct drm_device *dev, 


	return ret;

}

EXPORT_SYMBOL(drm_gem_prime_handle_to_fd);



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

				 struct drm_file *file_priv)
@@ -864,9 +866,9 @@ EXPORT_SYMBOL(drm_prime_get_contiguous_size); 
 * @obj: GEM object to export

 * @flags: flags like DRM_CLOEXEC and DRM_RDWR

 *

 * This is the implementation of the &drm_gem_object_funcs.export functions

 * for GEM drivers using the PRIME helpers. It is used as the default for

 * drivers that do not set their own.

 * This is the implementation of the &drm_gem_object_funcs.export functions for GEM drivers

 * 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_gem_object *obj,

				     int flags)
@@ -962,9 +964,10 @@ EXPORT_SYMBOL(drm_gem_prime_import_dev); 
 * @dev: drm_device to import into

 * @dma_buf: dma-buf object to import

 *

 * This is the implementation of the gem_prime_import functions for GEM

 * drivers using the PRIME helpers. It is the default for drivers that do

 * not set their own &drm_driver.gem_prime_import.

 * This is the implementation of the gem_prime_import functions for GEM drivers

 * using the PRIME helpers. Drivers can use this as their

 * &drm_driver.gem_prime_import implementation. It is used as the default

 * implementation in drm_gem_prime_fd_to_handle().

 *

 * Drivers must arrange to call drm_prime_gem_destroy() from their

 * &drm_gem_object_funcs.free hook when using this function.

include/drm/drm_prime.h

+7 −0
Original line number Diff line number Diff line
@@ -60,12 +60,19 @@ enum dma_data_direction; 


struct drm_device;

struct drm_gem_object;

struct drm_file;



/* core prime functions */

struct dma_buf *drm_gem_dmabuf_export(struct drm_device *dev,

				      struct dma_buf_export_info *exp_info);

void drm_gem_dmabuf_release(struct dma_buf *dma_buf);



int drm_gem_prime_fd_to_handle(struct drm_device *dev,

			       struct drm_file *file_priv, int prime_fd, uint32_t *handle);

int drm_gem_prime_handle_to_fd(struct drm_device *dev,

			       struct drm_file *file_priv, uint32_t handle, uint32_t flags,

			       int *prime_fd);



/* helper functions for exporting */

int drm_gem_map_attach(struct dma_buf *dma_buf,

		       struct dma_buf_attachment *attach);