Skip to content

L
linux
Commit c308279f authored by Samuel Li's avatar Samuel Li Committed by Alex Deucher
Browse files
Options

drm: export gem dmabuf_ops for drivers to reuse 

Signed-off-by: default avatarSamuel Li <Samuel.Li@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1515100334-6845-1-git-send-email-Samuel.Li@amd.com
parent a10195bb
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 22 deletions
drivers/gpu/drm/drm_prime.c
View file @ c308279f
...@@ -180,9 +180,8 @@ static int drm_prime_lookup_buf_handle(struct drm_prime_file_private *prime_fpri ...@@ -180,9 +180,8 @@ static int drm_prime_lookup_buf_handle(struct drm_prime_file_private *prime_fpri
return -ENOENT; return -ENOENT;
} }
static int drm_gem_map_attach(struct dma_buf *dma_buf, int drm_gem_map_attach(struct dma_buf *dma_buf, struct device *target_dev,
struct device *target_dev, struct dma_buf_attachment *attach)
struct dma_buf_attachment *attach)
{ {
struct drm_prime_attachment *prime_attach; struct drm_prime_attachment *prime_attach;
struct drm_gem_object *obj = dma_buf->priv; struct drm_gem_object *obj = dma_buf->priv;
...@@ -200,9 +199,10 @@ static int drm_gem_map_attach(struct dma_buf *dma_buf, ...@@ -200,9 +199,10 @@ static int drm_gem_map_attach(struct dma_buf *dma_buf,
return dev->driver->gem_prime_pin(obj); return dev->driver->gem_prime_pin(obj);
} }
EXPORT_SYMBOL(drm_gem_map_attach);
static void drm_gem_map_detach(struct dma_buf *dma_buf, void drm_gem_map_detach(struct dma_buf *dma_buf,
struct dma_buf_attachment *attach) struct dma_buf_attachment *attach)
{ {
struct drm_prime_attachment *prime_attach = attach->priv; struct drm_prime_attachment *prime_attach = attach->priv;
struct drm_gem_object *obj = dma_buf->priv; struct drm_gem_object *obj = dma_buf->priv;
...@@ -228,6 +228,7 @@ static void drm_gem_map_detach(struct dma_buf *dma_buf, ...@@ -228,6 +228,7 @@ static void drm_gem_map_detach(struct dma_buf *dma_buf,
kfree(prime_attach); kfree(prime_attach);
attach->priv = NULL; attach->priv = NULL;
} }
EXPORT_SYMBOL(drm_gem_map_detach);
void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv, void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv,
struct dma_buf *dma_buf) struct dma_buf *dma_buf)
...@@ -254,8 +255,8 @@ void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpr ...@@ -254,8 +255,8 @@ void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpr
} }
} }
static struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach, struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach,
enum dma_data_direction dir) enum dma_data_direction dir)
{ {
struct drm_prime_attachment *prime_attach = attach->priv; struct drm_prime_attachment *prime_attach = attach->priv;
struct drm_gem_object *obj = attach->dmabuf->priv; struct drm_gem_object *obj = attach->dmabuf->priv;
...@@ -291,13 +292,15 @@ static struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach, ...@@ -291,13 +292,15 @@ static struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach,
return sgt; return sgt;
} }
EXPORT_SYMBOL(drm_gem_map_dma_buf);
static void drm_gem_unmap_dma_buf(struct dma_buf_attachment *attach, void drm_gem_unmap_dma_buf(struct dma_buf_attachment *attach,
struct sg_table *sgt, struct sg_table *sgt,
enum dma_data_direction dir) enum dma_data_direction dir)
{ {
/* nothing to be done here */ /* nothing to be done here */
} }
EXPORT_SYMBOL(drm_gem_unmap_dma_buf);
/** /**
* drm_gem_dmabuf_export - dma_buf export implementation for GEM * drm_gem_dmabuf_export - dma_buf export implementation for GEM
...@@ -348,47 +351,52 @@ void drm_gem_dmabuf_release(struct dma_buf *dma_buf) ...@@ -348,47 +351,52 @@ void drm_gem_dmabuf_release(struct dma_buf *dma_buf)
} }
EXPORT_SYMBOL(drm_gem_dmabuf_release); EXPORT_SYMBOL(drm_gem_dmabuf_release);
static void *drm_gem_dmabuf_vmap(struct dma_buf *dma_buf) void *drm_gem_dmabuf_vmap(struct dma_buf *dma_buf)
{ {
struct drm_gem_object *obj = dma_buf->priv; struct drm_gem_object *obj = dma_buf->priv;
struct drm_device *dev = obj->dev; struct drm_device *dev = obj->dev;
return dev->driver->gem_prime_vmap(obj); return dev->driver->gem_prime_vmap(obj);
} }
EXPORT_SYMBOL(drm_gem_dmabuf_vmap);
static void drm_gem_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr) void drm_gem_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr)
{ {
struct drm_gem_object *obj = dma_buf->priv; struct drm_gem_object *obj = dma_buf->priv;
struct drm_device *dev = obj->dev; struct drm_device *dev = obj->dev;
dev->driver->gem_prime_vunmap(obj, vaddr); dev->driver->gem_prime_vunmap(obj, vaddr);
} }
EXPORT_SYMBOL(drm_gem_dmabuf_vunmap);
static void *drm_gem_dmabuf_kmap_atomic(struct dma_buf *dma_buf, void *drm_gem_dmabuf_kmap_atomic(struct dma_buf *dma_buf,
unsigned long page_num) unsigned long page_num)
{ {
return NULL; return NULL;
} }
EXPORT_SYMBOL(drm_gem_dmabuf_kmap_atomic);
static void drm_gem_dmabuf_kunmap_atomic(struct dma_buf *dma_buf, void drm_gem_dmabuf_kunmap_atomic(struct dma_buf *dma_buf,
unsigned long page_num, void *addr) unsigned long page_num, void *addr)
{ {
} }
static void *drm_gem_dmabuf_kmap(struct dma_buf *dma_buf, EXPORT_SYMBOL(drm_gem_dmabuf_kunmap_atomic);
unsigned long page_num)
void *drm_gem_dmabuf_kmap(struct dma_buf *dma_buf, unsigned long page_num)
{ {
return NULL; return NULL;
} }
EXPORT_SYMBOL(drm_gem_dmabuf_kmap);
static void drm_gem_dmabuf_kunmap(struct dma_buf *dma_buf, void drm_gem_dmabuf_kunmap(struct dma_buf *dma_buf, unsigned long page_num,
unsigned long page_num, void *addr) void *addr)
{ {
} }
EXPORT_SYMBOL(drm_gem_dmabuf_kunmap);
static int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma)
struct vm_area_struct *vma)
{ {
struct drm_gem_object *obj = dma_buf->priv; struct drm_gem_object *obj = dma_buf->priv;
struct drm_device *dev = obj->dev; struct drm_device *dev = obj->dev;
...@@ -398,6 +406,7 @@ static int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, ...@@ -398,6 +406,7 @@ static int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf,
return dev->driver->gem_prime_mmap(obj, vma); return dev->driver->gem_prime_mmap(obj, vma);
} }
EXPORT_SYMBOL(drm_gem_dmabuf_mmap);
static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = {
.attach = drm_gem_map_attach, .attach = drm_gem_map_attach,
......
include/drm/drm_prime.h
View file @ c308279f
...@@ -54,6 +54,9 @@ struct device; ...@@ -54,6 +54,9 @@ struct device;
struct dma_buf_export_info; struct dma_buf_export_info;
struct dma_buf; struct dma_buf;
struct dma_buf_attachment;
enum dma_data_direction;
struct drm_device; struct drm_device;
struct drm_gem_object; struct drm_gem_object;
...@@ -79,6 +82,25 @@ int drm_gem_prime_fd_to_handle(struct drm_device *dev, ...@@ -79,6 +82,25 @@ int drm_gem_prime_fd_to_handle(struct drm_device *dev,
struct dma_buf *drm_gem_dmabuf_export(struct drm_device *dev, struct dma_buf *drm_gem_dmabuf_export(struct drm_device *dev,
struct dma_buf_export_info *exp_info); struct dma_buf_export_info *exp_info);
void drm_gem_dmabuf_release(struct dma_buf *dma_buf); void drm_gem_dmabuf_release(struct dma_buf *dma_buf);
int drm_gem_map_attach(struct dma_buf *dma_buf, struct device *target_dev,
struct dma_buf_attachment *attach);
void drm_gem_map_detach(struct dma_buf *dma_buf,
struct dma_buf_attachment *attach);
struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach,
enum dma_data_direction dir);
void drm_gem_unmap_dma_buf(struct dma_buf_attachment *attach,
struct sg_table *sgt,
enum dma_data_direction dir);
void *drm_gem_dmabuf_vmap(struct dma_buf *dma_buf);
void drm_gem_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr);
void *drm_gem_dmabuf_kmap_atomic(struct dma_buf *dma_buf,
unsigned long page_num);
void drm_gem_dmabuf_kunmap_atomic(struct dma_buf *dma_buf,
unsigned long page_num, void *addr);
void *drm_gem_dmabuf_kmap(struct dma_buf *dma_buf, unsigned long page_num);
void drm_gem_dmabuf_kunmap(struct dma_buf *dma_buf, unsigned long page_num,
void *addr);
int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma);
int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages, int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
dma_addr_t *addrs, int max_pages); dma_addr_t *addrs, int max_pages);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7