public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-04-13 09:59:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/gem-shmem: Test for imported buffers with drm_gem_is_imported()

Browse source 
Instead of testing import_attach for imported GEM buffers, invoke
drm_gem_is_imported() to do the test.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Anusha Srivatsa <asrivats@redhat.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250226172457.217725-5-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2025-02-26 18:03:07 +01:00
parent e8afa1557f
commit dbdd636e51
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/gpu/drm/drm_gem_shmem_helper.c
View file

@ -160,7 +160,7 @@ void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem)
{ {
struct drm_gem_object *obj = &shmem->base; struct drm_gem_object *obj = &shmem->base;
if (obj->import_attach) { if (drm_gem_is_imported(obj)) {
drm_prime_gem_destroy(obj, shmem->sgt); drm_prime_gem_destroy(obj, shmem->sgt);
} else { } else {
dma_resv_lock(shmem->base.resv, NULL); dma_resv_lock(shmem->base.resv, NULL);
@ -255,7 +255,7 @@ int drm_gem_shmem_pin_locked(struct drm_gem_shmem_object *shmem)
dma_resv_assert_held(shmem->base.resv); dma_resv_assert_held(shmem->base.resv);
drm_WARN_ON(shmem->base.dev, shmem->base.import_attach); drm_WARN_ON(shmem->base.dev, drm_gem_is_imported(&shmem->base));
ret = drm_gem_shmem_get_pages(shmem); ret = drm_gem_shmem_get_pages(shmem);
@ -286,7 +286,7 @@ int drm_gem_shmem_pin(struct drm_gem_shmem_object *shmem)
struct drm_gem_object *obj = &shmem->base; struct drm_gem_object *obj = &shmem->base;
int ret; int ret;
drm_WARN_ON(obj->dev, obj->import_attach); drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
ret = dma_resv_lock_interruptible(shmem->base.resv, NULL); ret = dma_resv_lock_interruptible(shmem->base.resv, NULL);
if (ret) if (ret)
@ -309,7 +309,7 @@ void drm_gem_shmem_unpin(struct drm_gem_shmem_object *shmem)
{ {
struct drm_gem_object *obj = &shmem->base; struct drm_gem_object *obj = &shmem->base;
drm_WARN_ON(obj->dev, obj->import_attach); drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
dma_resv_lock(shmem->base.resv, NULL); dma_resv_lock(shmem->base.resv, NULL);
drm_gem_shmem_unpin_locked(shmem); drm_gem_shmem_unpin_locked(shmem);
@ -338,7 +338,7 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem,
struct drm_gem_object *obj = &shmem->base; struct drm_gem_object *obj = &shmem->base;
int ret = 0; int ret = 0;
if (obj->import_attach) { if (drm_gem_is_imported(obj)) {
ret = dma_buf_vmap(obj->import_attach->dmabuf, map); ret = dma_buf_vmap(obj->import_attach->dmabuf, map);
if (!ret) { if (!ret) {
if (drm_WARN_ON(obj->dev, map->is_iomem)) { if (drm_WARN_ON(obj->dev, map->is_iomem)) {
@ -378,7 +378,7 @@ int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem,
return 0; return 0;
err_put_pages: err_put_pages:
if (!obj->import_attach) if (!drm_gem_is_imported(obj))
drm_gem_shmem_put_pages(shmem); drm_gem_shmem_put_pages(shmem);
err_zero_use: err_zero_use:
shmem->vmap_use_count = 0; shmem->vmap_use_count = 0;
@ -404,7 +404,7 @@ void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem,
{ {
struct drm_gem_object *obj = &shmem->base; struct drm_gem_object *obj = &shmem->base;
if (obj->import_attach) { if (drm_gem_is_imported(obj)) {
dma_buf_vunmap(obj->import_attach->dmabuf, map); dma_buf_vunmap(obj->import_attach->dmabuf, map);
} else { } else {
dma_resv_assert_held(shmem->base.resv); dma_resv_assert_held(shmem->base.resv);
@ -566,7 +566,7 @@ static void drm_gem_shmem_vm_open(struct vm_area_struct *vma)
struct drm_gem_object *obj = vma->vm_private_data; struct drm_gem_object *obj = vma->vm_private_data;
struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj); struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);
drm_WARN_ON(obj->dev, obj->import_attach); drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
dma_resv_lock(shmem->base.resv, NULL); dma_resv_lock(shmem->base.resv, NULL);
@ -618,7 +618,7 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct
struct drm_gem_object *obj = &shmem->base; struct drm_gem_object *obj = &shmem->base;
int ret; int ret;
if (obj->import_attach) { if (drm_gem_is_imported(obj)) {
/* Reset both vm_ops and vm_private_data, so we don't end up with /* Reset both vm_ops and vm_private_data, so we don't end up with
* vm_ops pointing to our implementation if the dma-buf backend * vm_ops pointing to our implementation if the dma-buf backend
* doesn't set those fields. * doesn't set those fields.
@ -663,7 +663,7 @@ EXPORT_SYMBOL_GPL(drm_gem_shmem_mmap);
void drm_gem_shmem_print_info(const struct drm_gem_shmem_object *shmem, void drm_gem_shmem_print_info(const struct drm_gem_shmem_object *shmem,
struct drm_printer *p, unsigned int indent) struct drm_printer *p, unsigned int indent)
{ {
if (shmem->base.import_attach) if (drm_gem_is_imported(&shmem->base))
return; return;
drm_printf_indent(p, indent, "pages_use_count=%u\n", shmem->pages_use_count); drm_printf_indent(p, indent, "pages_use_count=%u\n", shmem->pages_use_count);
@ -690,7 +690,7 @@ struct sg_table *drm_gem_shmem_get_sg_table(struct drm_gem_shmem_object *shmem)
{ {
struct drm_gem_object *obj = &shmem->base; struct drm_gem_object *obj = &shmem->base;
drm_WARN_ON(obj->dev, obj->import_attach); drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
return drm_prime_pages_to_sg(obj->dev, shmem->pages, obj->size >> PAGE_SHIFT); return drm_prime_pages_to_sg(obj->dev, shmem->pages, obj->size >> PAGE_SHIFT);
} }
@ -705,7 +705,7 @@ static struct sg_table *drm_gem_shmem_get_pages_sgt_locked(struct drm_gem_shmem_
if (shmem->sgt) if (shmem->sgt)
return shmem->sgt; return shmem->sgt;
drm_WARN_ON(obj->dev, obj->import_attach); drm_WARN_ON(obj->dev, drm_gem_is_imported(obj));
ret = drm_gem_shmem_get_pages(shmem); ret = drm_gem_shmem_get_pages(shmem);
if (ret) if (ret)

2
include/drm/drm_gem_shmem_helper.h
View file

@ -120,7 +120,7 @@ static inline bool drm_gem_shmem_is_purgeable(struct drm_gem_shmem_object *shmem
{ {
return (shmem->madv > 0) && return (shmem->madv > 0) &&
!shmem->vmap_use_count && shmem->sgt && !shmem->vmap_use_count && shmem->sgt &&
!shmem->base.dma_buf && !shmem->base.import_attach; !shmem->base.dma_buf && !drm_gem_is_imported(&shmem->base);
} }
void drm_gem_shmem_purge(struct drm_gem_shmem_object *shmem); void drm_gem_shmem_purge(struct drm_gem_shmem_object *shmem);