diff options
author | Dave Airlie <airlied@redhat.com> | 2020-09-17 07:18:51 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-09-17 09:07:11 +0300 |
commit | b40be05ed255d9a0257fb66ab2728ecca2c9d597 (patch) | |
tree | bf69d734e4413c24ce2e60f273d1de637a4aea5e /include/drm | |
parent | 818280d5adf1d80e78f95821815148abe9407e14 (diff) | |
parent | be0704beb229431f206fee3ddd65fa2c5eebdce3 (diff) | |
download | linux-b40be05ed255d9a0257fb66ab2728ecca2c9d597.tar.xz |
Merge branch 'for-5.10-drm-sg-fix' of https://github.com/mszyprow/linux into drm-next
Please pull a set of fixes for various DRM drivers that finally resolve
incorrect usage of the scatterlists (struct sg_table nents and orig_nents
entries), what causes issues when IOMMU is used.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200910080505.24456-1-m.szyprowski@samsung.com
Diffstat (limited to 'include/drm')
-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 9af7422b44cf..47ef11614627 100644 --- a/include/drm/drm_prime.h +++ b/include/drm/drm_prime.h @@ -92,6 +92,8 @@ struct sg_table *drm_prime_pages_to_sg(struct page **pages, unsigned int nr_page 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, |