moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "FROMLIST: dma-buf: add support for virtio exported objects"

Browse Source 
This reverts commit 0787bdf576.

No AOSP user and hasn't been exported since android11-5.4.

Cc: David Stevens <stevensd@chromium.org>
Suggested-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Change-Id: I19eaa27d3c9cfdad1f8b47ff559632034c660b60
This commit is contained in:
Lee Jones
2021-05-26 13:43:51 +01:00
parent 82306698be
commit 8067e36749
2 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/dma-buf/dma-buf.c
View File

@@ -1399,18 +1399,6 @@ int dma_buf_get_flags(struct dma_buf *dmabuf, unsigned long *flags)
} }
EXPORT_SYMBOL_GPL(dma_buf_get_flags); EXPORT_SYMBOL_GPL(dma_buf_get_flags);
int dma_buf_get_uuid(struct dma_buf *dmabuf, uuid_t *uuid)
{
if (WARN_ON(!dmabuf) || !uuid)
return -EINVAL;
if (!dmabuf->ops->get_uuid)
return -ENODEV;
return dmabuf->ops->get_uuid(dmabuf, uuid);
}
EXPORT_SYMBOL_GPL(dma_buf_get_uuid);
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
static int dma_buf_debug_show(struct seq_file *s, void *unused) static int dma_buf_debug_show(struct seq_file *s, void *unused)
{ {

15
include/linux/dma-buf.h
View File

@@ -328,21 +328,6 @@ struct dma_buf_ops {
int (*vmap)(struct dma_buf *dmabuf, struct dma_buf_map *map); int (*vmap)(struct dma_buf *dmabuf, struct dma_buf_map *map);
void (*vunmap)(struct dma_buf *dmabuf, struct dma_buf_map *map); void (*vunmap)(struct dma_buf *dmabuf, struct dma_buf_map *map);
/**
* @get_uuid
*
* This is called by dma_buf_get_uuid to get the UUID which identifies
* the buffer to virtio devices.
*
* This callback is optional.
*
* Returns:
*
* 0 on success or a negative error code on failure. On success uuid
* will be populated with the buffer's UUID.
*/
int (*get_uuid)(struct dma_buf *dmabuf, uuid_t *uuid);
/** /**
* @get_flags: * @get_flags:
* *