diff options
author | 2020-11-02 11:17:54 +0100 | |
---|---|---|
committer | 2020-11-02 11:17:54 +0100 | |
commit | c489573b5b6ce6442ad4658d9d5ec77839b91622 (patch) | |
tree | 6db35e19cfb4c1280033a5545c94e15ac9c7b863 /include/drm/drm_prime.h | |
parent | fbdev/sh_mobile: Drop unused include (diff) | |
parent | Linux 5.10-rc2 (diff) | |
download | linux-c489573b5b6ce6442ad4658d9d5ec77839b91622.tar.gz linux-c489573b5b6ce6442ad4658d9d5ec77839b91622.tar.bz2 linux-c489573b5b6ce6442ad4658d9d5ec77839b91622.zip |
Merge drm/drm-next into drm-misc-next
Daniel needs -rc2 in drm-misc-next to merge some patches
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/drm/drm_prime.h')
-rw-r--r-- | include/drm/drm_prime.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h index 093f760cc131..0991a47a1567 100644 --- a/include/drm/drm_prime.h +++ b/include/drm/drm_prime.h @@ -94,6 +94,8 @@ struct sg_table *drm_prime_pages_to_sg(struct drm_device *dev, struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj, int flags); +unsigned long drm_prime_get_contiguous_size(struct sg_table *sgt); + /* helper functions for importing */ struct drm_gem_object *drm_gem_prime_import_dev(struct drm_device *dev, struct dma_buf *dma_buf, |