Commit cfe28f90 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/shmem-helper: Only dma-buf imports are private obj 



I broke that in my refactoring:

commit 7d2cd72a
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 crucial hint in debugging this.

Tested-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reported-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Fixes: 7d2cd72a ("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: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200616114723.2363268-1-daniel.vetter@ffwll.ch
parent 5b9f5f11

drivers/gpu/drm/drm_gem_shmem_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -379,7 +379,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;
@@ -732,7 +732,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);