Commit c6bb9baa authored by Daniel Vetter's avatar Daniel Vetter

drm: Extract drm_prime.h

Plus a little bit more documentation.

v2: Untangle the missing forward decls to make drm_prime|gem.h
free-standing.
Reviewed-by: default avatarGustavo Padovan <gustavo.padovan@collabora.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170308141257.12119-3-daniel.vetter@ffwll.ch
parent aabbcab6
...@@ -449,6 +449,9 @@ PRIME Helper Functions ...@@ -449,6 +449,9 @@ PRIME Helper Functions
PRIME Function References PRIME Function References
------------------------- -------------------------
.. kernel-doc:: include/drm/drm_prime.h
:internal:
.. kernel-doc:: drivers/gpu/drm/drm_prime.c .. kernel-doc:: drivers/gpu/drm/drm_prime.c
:export: :export:
......
...@@ -29,8 +29,9 @@ ...@@ -29,8 +29,9 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/dma-buf.h> #include <linux/dma-buf.h>
#include <linux/rbtree.h> #include <linux/rbtree.h>
#include <drm/drmP.h> #include <drm/drm_prime.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <drm/drmP.h>
#include "drm_internal.h" #include "drm_internal.h"
......
...@@ -51,13 +51,13 @@ ...@@ -51,13 +51,13 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <linux/rbtree.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/dma-fence.h> #include <linux/dma-fence.h>
#include <linux/module.h>
#include <asm/mman.h> #include <asm/mman.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
#include <drm/drm_mm.h> #include <drm/drm_mm.h>
#include <drm/drm_os_linux.h> #include <drm/drm_os_linux.h>
#include <drm/drm_sarea.h> #include <drm/drm_sarea.h>
#include <drm/drm_vma_manager.h>
#include <drm/drm_drv.h> #include <drm/drm_drv.h>
#include <drm/drm_prime.h>
struct module; struct module;
...@@ -89,6 +89,7 @@ struct drm_dma_handle; ...@@ -89,6 +89,7 @@ struct drm_dma_handle;
struct drm_gem_object; struct drm_gem_object;
struct drm_master; struct drm_master;
struct drm_vblank_crtc; struct drm_vblank_crtc;
struct drm_vma_offset_manager;
struct device_node; struct device_node;
struct videomode; struct videomode;
...@@ -370,12 +371,6 @@ struct drm_pending_event { ...@@ -370,12 +371,6 @@ struct drm_pending_event {
we deliver the event, for tracing only */ we deliver the event, for tracing only */
}; };
struct drm_prime_file_private {
struct mutex lock;
struct rb_root dmabufs;
struct rb_root handles;
};
/** File private data */ /** File private data */
struct drm_file { struct drm_file {
unsigned authenticated :1; unsigned authenticated :1;
...@@ -759,27 +754,6 @@ static inline int drm_debugfs_remove_files(const struct drm_info_list *files, ...@@ -759,27 +754,6 @@ static inline int drm_debugfs_remove_files(const struct drm_info_list *files,
} }
#endif #endif
struct dma_buf_export_info;
extern struct dma_buf *drm_gem_prime_export(struct drm_device *dev,
struct drm_gem_object *obj,
int flags);
extern 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);
extern struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
struct dma_buf *dma_buf);
extern int drm_gem_prime_fd_to_handle(struct drm_device *dev,
struct drm_file *file_priv, int prime_fd, uint32_t *handle);
struct dma_buf *drm_gem_dmabuf_export(struct drm_device *dev,
struct dma_buf_export_info *exp_info);
extern void drm_gem_dmabuf_release(struct dma_buf *dma_buf);
extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
dma_addr_t *addrs, int max_pages);
extern struct sg_table *drm_prime_pages_to_sg(struct page **pages, unsigned int nr_pages);
extern void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg);
extern struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size, extern struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size,
size_t align); size_t align);
......
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <linux/kref.h>
#include <drm/drm_vma_manager.h>
/** /**
* struct drm_gem_object - GEM buffer object * struct drm_gem_object - GEM buffer object
* *
......
/*
* Copyright © 2012 Red Hat
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* Copyright (c) 2009-2010, Code Aurora Forum.
*
* 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:
* Dave Airlie <airlied@redhat.com>
* Rob Clark <rob.clark@linaro.org>
*
*/
#ifndef __DRM_PRIME_H__
#define __DRM_PRIME_H__
#include <linux/mutex.h>
#include <linux/rbtree.h>
/**
* struct drm_prime_file_private - per-file tracking for PRIME
*
* This just contains the internal &struct dma_buf and handle caches for each
* &struct drm_file used by the PRIME core code.
*/
struct drm_prime_file_private {
/* private: */
struct mutex lock;
struct rb_root dmabufs;
struct rb_root handles;
};
struct dma_buf_export_info;
struct dma_buf;
struct drm_device;
struct drm_gem_object;
struct drm_file;
extern struct dma_buf *drm_gem_prime_export(struct drm_device *dev,
struct drm_gem_object *obj,
int flags);
extern 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);
extern struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev,
struct dma_buf *dma_buf);
extern int drm_gem_prime_fd_to_handle(struct drm_device *dev,
struct drm_file *file_priv, int prime_fd, uint32_t *handle);
struct dma_buf *drm_gem_dmabuf_export(struct drm_device *dev,
struct dma_buf_export_info *exp_info);
extern void drm_gem_dmabuf_release(struct dma_buf *dma_buf);
extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
dma_addr_t *addrs, int max_pages);
extern struct sg_table *drm_prime_pages_to_sg(struct page **pages, unsigned int nr_pages);
extern void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg);
#endif /* __DRM_PRIME_H__ */
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <drm/drm_mm.h> #include <drm/drm_mm.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/module.h>
#include <linux/rbtree.h> #include <linux/rbtree.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/types.h> #include <linux/types.h>
......
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