[PATCH] drm/shmem-helper: Only dma-buf imports are private obj - dri-devel - freedesktop.org experimental mailing list

16 Jun 2020

I broke that in my refactoring:
commit 7d2cd72a9aa3df3604cafd169a2d4a525afb68ca
Author: Daniel Vetter daniel.vetter@ffwll.ch
Date:   Fri May 29 16:05:42 2020 +0200
drm/shmem-helpers: Simplify dma-buf importing
I'm not entirely sure of the history here, but I suspect that in one
of the rebases or when applying the patch I moved the hunk from
drm_gem_shmem_prime_import_sg_table(), where it should be, to
drm_gem_shmem_create_with_handle(), which is totally wrong.
Remedy this.
Thanks for Thomas for the crucual hint in debugging this.
Reported-by: Thomas Zimmermann tzimmermann@suse.de
Fixes: 7d2cd72a9aa3 ("drm/shmem-helpers: Simplify dma-buf importing")
Cc: Boris Brezillon boris.brezillon@collabora.com
Cc: Thomas Zimmermann tzimmermann@suse.de
Cc: Gerd Hoffmann kraxel@redhat.com
Cc: Rob Herring robh@kernel.org
Cc: Noralf Trønnes noralf@tronnes.org
Signed-off-by: Daniel Vetter daniel.vetter@intel.com
---
 drivers/gpu/drm/drm_gem_shmem_helper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index 0a7e3b664bc2..837e0840990c 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -377,7 +377,7 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
    struct drm_gem_shmem_object *shmem;
    int ret;
-	shmem = __drm_gem_shmem_create(dev, size, true);
+	shmem = drm_gem_shmem_create(dev, size);
    if (IS_ERR(shmem))
    	return shmem;
@@ -730,7 +730,7 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev,
    size_t size = PAGE_ALIGN(attach->dmabuf->size);
    struct drm_gem_shmem_object *shmem;
-	shmem = drm_gem_shmem_create(dev, size);
+	shmem = __drm_gem_shmem_create(dev, size, true);
    if (IS_ERR(shmem))
    	return ERR_CAST(shmem);
-- 
2.27.0


    