Hi
On Tue, Sep 23, 2014 at 3:46 PM, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote:
> v2: Don't forget git add, noticed by David.
>
> Cc: David Herrmann <dh.herrmann@xxxxxxxxx>
Acked-by: David Herrmann <dh.herrmann@xxxxxxxxx>
Thanks
David
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
> ---
> drivers/gpu/drm/armada/armada_gem.h | 2 +
> drivers/gpu/drm/ast/ast_drv.h | 2 +
> drivers/gpu/drm/bochs/bochs.h | 2 +
> drivers/gpu/drm/cirrus/cirrus_drv.h | 2 +
> drivers/gpu/drm/drm_gem.c | 1 +
> drivers/gpu/drm/drm_info.c | 2 +
> drivers/gpu/drm/drm_prime.c | 2 +
> drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +
> drivers/gpu/drm/gma500/gtt.h | 1 +
> drivers/gpu/drm/i915/i915_drv.h | 1 +
> drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +
> drivers/gpu/drm/msm/msm_drv.h | 1 +
> drivers/gpu/drm/nouveau/nouveau_bo.h | 2 +
> drivers/gpu/drm/omapdrm/omap_drv.h | 1 +
> drivers/gpu/drm/qxl/qxl_drv.h | 2 +
> drivers/gpu/drm/radeon/radeon.h | 2 +
> drivers/gpu/drm/radeon/radeon_drv.c | 2 +
> drivers/gpu/drm/tegra/gem.h | 1 +
> drivers/gpu/drm/udl/udl_drv.h | 1 +
> include/drm/drmP.h | 148 +-------------------------
> include/drm/drm_gem.h | 183 ++++++++++++++++++++++++++++++++
> include/drm/drm_gem_cma_helper.h | 1 +
> 22 files changed, 216 insertions(+), 147 deletions(-)
> create mode 100644 include/drm/drm_gem.h
>
> diff --git a/drivers/gpu/drm/armada/armada_gem.h b/drivers/gpu/drm/armada/armada_gem.h
> index 00b6cd461a03..b000ea3a829a 100644
> --- a/drivers/gpu/drm/armada/armada_gem.h
> +++ b/drivers/gpu/drm/armada/armada_gem.h
> @@ -8,6 +8,8 @@
> #ifndef ARMADA_GEM_H
> #define ARMADA_GEM_H
>
> +#include <drm/drm_gem.h>
> +
> /* GEM */
> struct armada_gem_object {
> struct drm_gem_object obj;
> diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
> index 7485ff945ca9..86205a28e56b 100644
> --- a/drivers/gpu/drm/ast/ast_drv.h
> +++ b/drivers/gpu/drm/ast/ast_drv.h
> @@ -36,6 +36,8 @@
> #include <drm/ttm/ttm_memory.h>
> #include <drm/ttm/ttm_module.h>
>
> +#include <drm/drm_gem.h>
> +
> #include <linux/i2c.h>
> #include <linux/i2c-algo-bit.h>
>
> diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h
> index 4f6e7b3a3635..71f2687fc3cc 100644
> --- a/drivers/gpu/drm/bochs/bochs.h
> +++ b/drivers/gpu/drm/bochs/bochs.h
> @@ -7,6 +7,8 @@
> #include <drm/drm_crtc_helper.h>
> #include <drm/drm_fb_helper.h>
>
> +#include <drm/drm_gem.h>
> +
> #include <ttm/ttm_bo_driver.h>
> #include <ttm/ttm_page_alloc.h>
>
> diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.h b/drivers/gpu/drm/cirrus/cirrus_drv.h
> index dd2cfc9024aa..d44e69daa239 100644
> --- a/drivers/gpu/drm/cirrus/cirrus_drv.h
> +++ b/drivers/gpu/drm/cirrus/cirrus_drv.h
> @@ -21,6 +21,8 @@
> #include <drm/ttm/ttm_memory.h>
> #include <drm/ttm/ttm_module.h>
>
> +#include <drm/drm_gem.h>
> +
> #define DRIVER_AUTHOR "Matthew Garrett"
>
> #define DRIVER_NAME "cirrus"
> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> index f9af78541505..cd45e45e2cce 100644
> --- a/drivers/gpu/drm/drm_gem.c
> +++ b/drivers/gpu/drm/drm_gem.c
> @@ -38,6 +38,7 @@
> #include <linux/dma-buf.h>
> #include <drm/drmP.h>
> #include <drm/drm_vma_manager.h>
> +#include <drm/drm_gem.h>
> #include "drm_internal.h"
>
> /** @file drm_gem.c
> diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
> index 0780541f7935..51efebd434f3 100644
> --- a/drivers/gpu/drm/drm_info.c
> +++ b/drivers/gpu/drm/drm_info.c
> @@ -35,6 +35,8 @@
>
> #include <linux/seq_file.h>
> #include <drm/drmP.h>
> +#include <drm/drm_gem.h>
> +
> #include "drm_legacy.h"
>
> /**
> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
> index 2807a771f505..7826de9da276 100644
> --- a/drivers/gpu/drm/drm_prime.c
> +++ b/drivers/gpu/drm/drm_prime.c
> @@ -29,6 +29,8 @@
> #include <linux/export.h>
> #include <linux/dma-buf.h>
> #include <drm/drmP.h>
> +#include <drm/drm_gem.h>
> +
> #include "drm_internal.h"
>
> /*
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.h b/drivers/gpu/drm/exynos/exynos_drm_gem.h
> index 1592c0ba7de8..74818b15e853 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_gem.h
> +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.h
> @@ -12,6 +12,8 @@
> #ifndef _EXYNOS_DRM_GEM_H_
> #define _EXYNOS_DRM_GEM_H_
>
> +#include <drm/drm_gem.h>
> +
> #define to_exynos_gem_obj(x) container_of(x,\
> struct exynos_drm_gem_obj, base)
>
> diff --git a/drivers/gpu/drm/gma500/gtt.h b/drivers/gpu/drm/gma500/gtt.h
> index f5860a739bd8..cdbb350c9d5d 100644
> --- a/drivers/gpu/drm/gma500/gtt.h
> +++ b/drivers/gpu/drm/gma500/gtt.h
> @@ -21,6 +21,7 @@
> #define _PSB_GTT_H_
>
> #include <drm/drmP.h>
> +#include <drm/drm_gem.h>
>
> /* This wants cleaning up with respect to the psb_dev and un-needed stuff */
> struct psb_gtt {
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 07dafa2c2d8c..e9f5765699b4 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -43,6 +43,7 @@
> #include <linux/i2c-algo-bit.h>
> #include <drm/intel-gtt.h>
> #include <drm/drm_legacy.h> /* for struct drm_dma_handle */
> +#include <drm/drm_gem.h>
> #include <linux/backlight.h>
> #include <linux/hashtable.h>
> #include <linux/intel-iommu.h>
> diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h
> index c03e347f3ffd..e9eea1d4e7c3 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_drv.h
> +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h
> @@ -22,6 +22,8 @@
> #include <drm/ttm/ttm_memory.h>
> #include <drm/ttm/ttm_module.h>
>
> +#include <drm/drm_gem.h>
> +
> #include <linux/i2c.h>
> #include <linux/i2c-algo-bit.h>
>
> diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
> index 8a2c5fd0893e..afaafd42dee7 100644
> --- a/drivers/gpu/drm/msm/msm_drv.h
> +++ b/drivers/gpu/drm/msm/msm_drv.h
> @@ -51,6 +51,7 @@ static inline struct device *msm_iommu_get_ctx(const char *ctx_name)
> #include <drm/drm_crtc_helper.h>
> #include <drm/drm_fb_helper.h>
> #include <drm/msm_drm.h>
> +#include <drm/drm_gem.h>
>
> struct msm_kms;
> struct msm_gpu;
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.h b/drivers/gpu/drm/nouveau/nouveau_bo.h
> index ae95b2d43b36..f238def41a92 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.h
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.h
> @@ -1,6 +1,8 @@
> #ifndef __NOUVEAU_BO_H__
> #define __NOUVEAU_BO_H__
>
> +#include <drm/drm_gem.h>
> +
> struct nouveau_channel;
> struct nouveau_fence;
> struct nouveau_vma;
> diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
> index 84d73a61b34b..60e47b33c801 100644
> --- a/drivers/gpu/drm/omapdrm/omap_drv.h
> +++ b/drivers/gpu/drm/omapdrm/omap_drv.h
> @@ -26,6 +26,7 @@
> #include <drm/drmP.h>
> #include <drm/drm_crtc_helper.h>
> #include <drm/omap_drm.h>
> +#include <drm/drm_gem.h>
> #include <linux/platform_data/omap_drm.h>
>
>
> diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
> index d75c0a9f674f..ff0772728eb0 100644
> --- a/drivers/gpu/drm/qxl/qxl_drv.h
> +++ b/drivers/gpu/drm/qxl/qxl_drv.h
> @@ -43,6 +43,8 @@
> #include <ttm/ttm_placement.h>
> #include <ttm/ttm_module.h>
>
> +#include <drm/drm_gem.h>
> +
> /* just for ttm_validate_buffer */
> #include <ttm/ttm_execbuf_util.h>
>
> diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
> index 82b0e11ade89..ef91ebb7c671 100644
> --- a/drivers/gpu/drm/radeon/radeon.h
> +++ b/drivers/gpu/drm/radeon/radeon.h
> @@ -74,6 +74,8 @@
> #include <ttm/ttm_module.h>
> #include <ttm/ttm_execbuf_util.h>
>
> +#include <drm/drm_gem.h>
> +
> #include "radeon_family.h"
> #include "radeon_mode.h"
> #include "radeon_reg.h"
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index dd082049fd5b..de108427a197 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -38,6 +38,8 @@
> #include <linux/module.h>
> #include <linux/pm_runtime.h>
> #include <linux/vga_switcheroo.h>
> +#include <drm/drm_gem.h>
> +
> #include "drm_crtc_helper.h"
> /*
> * KMS wrapper.
> diff --git a/drivers/gpu/drm/tegra/gem.h b/drivers/gpu/drm/tegra/gem.h
> index 43a25c853357..6538b56780c2 100644
> --- a/drivers/gpu/drm/tegra/gem.h
> +++ b/drivers/gpu/drm/tegra/gem.h
> @@ -15,6 +15,7 @@
>
> #include <drm/drm.h>
> #include <drm/drmP.h>
> +#include <drm/drm_gem.h>
>
> #define TEGRA_BO_BOTTOM_UP (1 << 0)
>
> diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
> index 51e10ee77f39..c7490a2489a7 100644
> --- a/drivers/gpu/drm/udl/udl_drv.h
> +++ b/drivers/gpu/drm/udl/udl_drv.h
> @@ -15,6 +15,7 @@
> #define UDL_DRV_H
>
> #include <linux/usb.h>
> +#include <drm/drm_gem.h>
>
> #define DRIVER_NAME "udl"
> #define DRIVER_DESC "DisplayLink"
> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> index 9130c8bd9e09..d46efbc255ed 100644
> --- a/include/drm/drmP.h
> +++ b/include/drm/drmP.h
> @@ -82,6 +82,7 @@ struct drm_agp_head;
> struct drm_local_map;
> struct drm_device_dma;
> struct drm_dma_handle;
> +struct drm_gem_object;
>
> struct device_node;
> struct videomode;
> @@ -331,93 +332,6 @@ struct drm_lock_data {
> };
>
> /**
> - * This structure defines the drm_mm memory object, which will be used by the
> - * DRM for its buffer objects.
> - */
> -struct drm_gem_object {
> - /** Reference count of this object */
> - struct kref refcount;
> -
> - /**
> - * handle_count - gem file_priv handle count of this object
> - *
> - * Each handle also holds a reference. Note that when the handle_count
> - * drops to 0 any global names (e.g. the id in the flink namespace) will
> - * be cleared.
> - *
> - * Protected by dev->object_name_lock.
> - * */
> - unsigned handle_count;
> -
> - /** Related drm device */
> - struct drm_device *dev;
> -
> - /** File representing the shmem storage */
> - struct file *filp;
> -
> - /* Mapping info for this object */
> - struct drm_vma_offset_node vma_node;
> -
> - /**
> - * Size of the object, in bytes. Immutable over the object's
> - * lifetime.
> - */
> - size_t size;
> -
> - /**
> - * Global name for this object, starts at 1. 0 means unnamed.
> - * Access is covered by the object_name_lock in the related drm_device
> - */
> - int name;
> -
> - /**
> - * Memory domains. These monitor which caches contain read/write data
> - * related to the object. When transitioning from one set of domains
> - * to another, the driver is called to ensure that caches are suitably
> - * flushed and invalidated
> - */
> - uint32_t read_domains;
> - uint32_t write_domain;
> -
> - /**
> - * While validating an exec operation, the
> - * new read/write domain values are computed here.
> - * They will be transferred to the above values
> - * at the point that any cache flushing occurs
> - */
> - uint32_t pending_read_domains;
> - uint32_t pending_write_domain;
> -
> - /**
> - * dma_buf - dma buf associated with this GEM object
> - *
> - * Pointer to the dma-buf associated with this gem object (either
> - * through importing or exporting). We break the resulting reference
> - * loop when the last gem handle for this object is released.
> - *
> - * Protected by obj->object_name_lock
> - */
> - struct dma_buf *dma_buf;
> -
> - /**
> - * import_attach - dma buf attachment backing this object
> - *
> - * Any foreign dma_buf imported as a gem object has this set to the
> - * attachment point for the device. This is invariant over the lifetime
> - * of a gem object.
> - *
> - * The driver's ->gem_free_object callback is responsible for cleaning
> - * up the dma_buf attachment and references acquired at import time.
> - *
> - * Note that the drm gem/prime core does not depend upon drivers setting
> - * this field any more. So for drivers where this doesn't make sense
> - * (e.g. virtual devices or a displaylink behind an usb bus) they can
> - * simply leave it as NULL.
> - */
> - struct dma_buf_attachment *import_attach;
> -};
> -
> -/**
> * struct drm_master - drm master structure
> *
> * @refcount: Refcount for this master object.
> @@ -1073,10 +987,6 @@ extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **
> extern struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages);
> extern void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg);
>
> -int drm_gem_dumb_destroy(struct drm_file *file,
> - struct drm_device *dev,
> - uint32_t handle);
> -
>
> extern struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size,
> size_t align);
> @@ -1085,62 +995,6 @@ extern void drm_pci_free(struct drm_device *dev, struct drm_dma_handle * dmah);
> /* sysfs support (drm_sysfs.c) */
> extern void drm_sysfs_hotplug_event(struct drm_device *dev);
>
> -/* Graphics Execution Manager library functions (drm_gem.c) */
> -void drm_gem_object_release(struct drm_gem_object *obj);
> -void drm_gem_object_free(struct kref *kref);
> -int drm_gem_object_init(struct drm_device *dev,
> - struct drm_gem_object *obj, size_t size);
> -void drm_gem_private_object_init(struct drm_device *dev,
> - struct drm_gem_object *obj, size_t size);
> -void drm_gem_vm_open(struct vm_area_struct *vma);
> -void drm_gem_vm_close(struct vm_area_struct *vma);
> -int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
> - struct vm_area_struct *vma);
> -int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
> -
> -static inline void
> -drm_gem_object_reference(struct drm_gem_object *obj)
> -{
> - kref_get(&obj->refcount);
> -}
> -
> -static inline void
> -drm_gem_object_unreference(struct drm_gem_object *obj)
> -{
> - if (obj != NULL)
> - kref_put(&obj->refcount, drm_gem_object_free);
> -}
> -
> -static inline void
> -drm_gem_object_unreference_unlocked(struct drm_gem_object *obj)
> -{
> - if (obj && !atomic_add_unless(&obj->refcount.refcount, -1, 1)) {
> - struct drm_device *dev = obj->dev;
> -
> - mutex_lock(&dev->struct_mutex);
> - if (likely(atomic_dec_and_test(&obj->refcount.refcount)))
> - drm_gem_object_free(&obj->refcount);
> - mutex_unlock(&dev->struct_mutex);
> - }
> -}
> -
> -int drm_gem_handle_create(struct drm_file *file_priv,
> - struct drm_gem_object *obj,
> - u32 *handlep);
> -int drm_gem_handle_delete(struct drm_file *filp, u32 handle);
> -
> -
> -void drm_gem_free_mmap_offset(struct drm_gem_object *obj);
> -int drm_gem_create_mmap_offset(struct drm_gem_object *obj);
> -int drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size);
> -
> -struct page **drm_gem_get_pages(struct drm_gem_object *obj);
> -void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
> - bool dirty, bool accessed);
> -
> -struct drm_gem_object *drm_gem_object_lookup(struct drm_device *dev,
> - struct drm_file *filp,
> - u32 handle);
>
> struct drm_device *drm_dev_alloc(struct drm_driver *driver,
> struct device *parent);
> diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
> new file mode 100644
> index 000000000000..1e6ae1458f7a
> --- /dev/null
> +++ b/include/drm/drm_gem.h
> @@ -0,0 +1,183 @@
> +#ifndef __DRM_GEM_H__
> +#define __DRM_GEM_H__
> +
> +/*
> + * GEM Graphics Execution Manager Driver Interfaces
> + *
> + * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
> + * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
> + * Copyright (c) 2009-2010, Code Aurora Forum.
> + * All rights reserved.
> + * Copyright © 2014 Intel Corporation
> + * Daniel Vetter <daniel.vetter@xxxxxxxx>
> + *
> + * Author: Rickard E. (Rik) Faith <faith@xxxxxxxxxxx>
> + * Author: Gareth Hughes <gareth@xxxxxxxxxxx>
> + *
> + * 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
> + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS 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.
> + */
> +
> +/**
> + * This structure defines the drm_mm memory object, which will be used by the
> + * DRM for its buffer objects.
> + */
> +struct drm_gem_object {
> + /** Reference count of this object */
> + struct kref refcount;
> +
> + /**
> + * handle_count - gem file_priv handle count of this object
> + *
> + * Each handle also holds a reference. Note that when the handle_count
> + * drops to 0 any global names (e.g. the id in the flink namespace) will
> + * be cleared.
> + *
> + * Protected by dev->object_name_lock.
> + * */
> + unsigned handle_count;
> +
> + /** Related drm device */
> + struct drm_device *dev;
> +
> + /** File representing the shmem storage */
> + struct file *filp;
> +
> + /* Mapping info for this object */
> + struct drm_vma_offset_node vma_node;
> +
> + /**
> + * Size of the object, in bytes. Immutable over the object's
> + * lifetime.
> + */
> + size_t size;
> +
> + /**
> + * Global name for this object, starts at 1. 0 means unnamed.
> + * Access is covered by the object_name_lock in the related drm_device
> + */
> + int name;
> +
> + /**
> + * Memory domains. These monitor which caches contain read/write data
> + * related to the object. When transitioning from one set of domains
> + * to another, the driver is called to ensure that caches are suitably
> + * flushed and invalidated
> + */
> + uint32_t read_domains;
> + uint32_t write_domain;
> +
> + /**
> + * While validating an exec operation, the
> + * new read/write domain values are computed here.
> + * They will be transferred to the above values
> + * at the point that any cache flushing occurs
> + */
> + uint32_t pending_read_domains;
> + uint32_t pending_write_domain;
> +
> + /**
> + * dma_buf - dma buf associated with this GEM object
> + *
> + * Pointer to the dma-buf associated with this gem object (either
> + * through importing or exporting). We break the resulting reference
> + * loop when the last gem handle for this object is released.
> + *
> + * Protected by obj->object_name_lock
> + */
> + struct dma_buf *dma_buf;
> +
> + /**
> + * import_attach - dma buf attachment backing this object
> + *
> + * Any foreign dma_buf imported as a gem object has this set to the
> + * attachment point for the device. This is invariant over the lifetime
> + * of a gem object.
> + *
> + * The driver's ->gem_free_object callback is responsible for cleaning
> + * up the dma_buf attachment and references acquired at import time.
> + *
> + * Note that the drm gem/prime core does not depend upon drivers setting
> + * this field any more. So for drivers where this doesn't make sense
> + * (e.g. virtual devices or a displaylink behind an usb bus) they can
> + * simply leave it as NULL.
> + */
> + struct dma_buf_attachment *import_attach;
> +};
> +
> +void drm_gem_object_release(struct drm_gem_object *obj);
> +void drm_gem_object_free(struct kref *kref);
> +int drm_gem_object_init(struct drm_device *dev,
> + struct drm_gem_object *obj, size_t size);
> +void drm_gem_private_object_init(struct drm_device *dev,
> + struct drm_gem_object *obj, size_t size);
> +void drm_gem_vm_open(struct vm_area_struct *vma);
> +void drm_gem_vm_close(struct vm_area_struct *vma);
> +int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
> + struct vm_area_struct *vma);
> +int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
> +
> +static inline void
> +drm_gem_object_reference(struct drm_gem_object *obj)
> +{
> + kref_get(&obj->refcount);
> +}
> +
> +static inline void
> +drm_gem_object_unreference(struct drm_gem_object *obj)
> +{
> + if (obj != NULL)
> + kref_put(&obj->refcount, drm_gem_object_free);
> +}
> +
> +static inline void
> +drm_gem_object_unreference_unlocked(struct drm_gem_object *obj)
> +{
> + if (obj && !atomic_add_unless(&obj->refcount.refcount, -1, 1)) {
> + struct drm_device *dev = obj->dev;
> +
> + mutex_lock(&dev->struct_mutex);
> + if (likely(atomic_dec_and_test(&obj->refcount.refcount)))
> + drm_gem_object_free(&obj->refcount);
> + mutex_unlock(&dev->struct_mutex);
> + }
> +}
> +
> +int drm_gem_handle_create(struct drm_file *file_priv,
> + struct drm_gem_object *obj,
> + u32 *handlep);
> +int drm_gem_handle_delete(struct drm_file *filp, u32 handle);
> +
> +
> +void drm_gem_free_mmap_offset(struct drm_gem_object *obj);
> +int drm_gem_create_mmap_offset(struct drm_gem_object *obj);
> +int drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size);
> +
> +struct page **drm_gem_get_pages(struct drm_gem_object *obj);
> +void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
> + bool dirty, bool accessed);
> +
> +struct drm_gem_object *drm_gem_object_lookup(struct drm_device *dev,
> + struct drm_file *filp,
> + u32 handle);
> +int drm_gem_dumb_destroy(struct drm_file *file,
> + struct drm_device *dev,
> + uint32_t handle);
> +
> +#endif /* __DRM_GEM_H__ */
> diff --git a/include/drm/drm_gem_cma_helper.h b/include/drm/drm_gem_cma_helper.h
> index 2a3cea91606d..42f11f3a8d39 100644
> --- a/include/drm/drm_gem_cma_helper.h
> +++ b/include/drm/drm_gem_cma_helper.h
> @@ -2,6 +2,7 @@
> #define __DRM_GEM_CMA_HELPER_H__
>
> #include <drm/drmP.h>
> +#include <drm/drm_gem.h>
>
> struct drm_gem_cma_object {
> struct drm_gem_object base;
> --
> 2.1.0
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
