Skip to content

Commit cfe28f9

Browse files
committed
drm/shmem-helper: Only dma-buf imports are private obj
I broke that in my refactoring: commit 7d2cd72 Author: Daniel Vetter <[email protected]> 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: Thomas Zimmermann <[email protected]> Reviewed-by: Thomas Zimmermann <[email protected]> Reported-by: Thomas Zimmermann <[email protected]> Fixes: 7d2cd72 ("drm/shmem-helpers: Simplify dma-buf importing") Cc: Boris Brezillon <[email protected]> Cc: Thomas Zimmermann <[email protected]> Cc: Gerd Hoffmann <[email protected]> Cc: Rob Herring <[email protected]> Cc: Noralf Trønnes <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 5b9f5f1 commit cfe28f9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/drm_gem_shmem_helper.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
379379
struct drm_gem_shmem_object *shmem;
380380
int ret;
381381

382-
shmem = __drm_gem_shmem_create(dev, size, true);
382+
shmem = drm_gem_shmem_create(dev, size);
383383
if (IS_ERR(shmem))
384384
return shmem;
385385

@@ -732,7 +732,7 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev,
732732
size_t size = PAGE_ALIGN(attach->dmabuf->size);
733733
struct drm_gem_shmem_object *shmem;
734734

735-
shmem = drm_gem_shmem_create(dev, size);
735+
shmem = __drm_gem_shmem_create(dev, size, true);
736736
if (IS_ERR(shmem))
737737
return ERR_CAST(shmem);
738738

0 commit comments

Comments
 (0)