diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-21 15:20:33 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-21 15:20:33 +0400 |
| commit | 8e7922bcbd2d1e87abace7c4e130ac93b1ed54a8 (patch) | |
| tree | 852c33c95478cbc7ec90a95d79066a88bfc6f357 /drivers/gpu/drm/udl/udl_drv.h | |
| parent | d51d01166ef5be6f048d6f121b48224fcf1241e5 (diff) | |
| parent | 4cd7db43d454d815c57d2cc171758c1caf540dd9 (diff) | |
Automatically merging rebase-umm-wip into merge-linux-linaro-core-tracking
Conflicting files:
Diffstat (limited to 'drivers/gpu/drm/udl/udl_drv.h')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_drv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h index 96820d03a303..fccd361f7b50 100644 --- a/drivers/gpu/drm/udl/udl_drv.h +++ b/drivers/gpu/drm/udl/udl_drv.h @@ -66,6 +66,7 @@ struct udl_gem_object { struct drm_gem_object base; struct page **pages; void *vmapping; + struct sg_table *sg; }; #define to_udl_bo(x) container_of(x, struct udl_gem_object, base) @@ -118,6 +119,8 @@ int udl_gem_init_object(struct drm_gem_object *obj); void udl_gem_free_object(struct drm_gem_object *gem_obj); struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev, size_t size); +struct drm_gem_object *udl_gem_prime_import(struct drm_device *dev, + struct dma_buf *dma_buf); int udl_gem_vmap(struct udl_gem_object *obj); void udl_gem_vunmap(struct udl_gem_object *obj); |