Skip to content

Commit 85fb1ed

Browse files
Thomas Zimmermanngregkh
authored andcommitted
drm/gem: Internally test import_attach for imported objects
commit 8260731 upstream. Test struct drm_gem_object.import_attach to detect imported objects. During object clenanup, the dma_buf field might be NULL. Testing it in an object's free callback then incorrectly does a cleanup as for native objects. Happens for calls to drm_mode_destroy_dumb_ioctl() that clears the dma_buf field in drm_gem_object_exported_dma_buf_free(). v3: - only test for import_attach (Boris) v2: - use import_attach.dmabuf instead of dma_buf (Christian) Signed-off-by: Thomas Zimmermann <[email protected]> Fixes: b57aa47 ("drm/gem: Test for imported GEM buffers with helper") Reported-by: Andy Yan <[email protected]> Closes: https://lore.kernel.org/dri-devel/[email protected]/ Tested-by: Andy Yan <[email protected]> Cc: Thomas Zimmermann <[email protected]> Cc: Anusha Srivatsa <[email protected]> Cc: Christian König <[email protected]> Cc: Maarten Lankhorst <[email protected]> Cc: Maxime Ripard <[email protected]> Cc: David Airlie <[email protected]> Cc: Simona Vetter <[email protected]> Cc: Sumit Semwal <[email protected]> Cc: "Christian König" <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Reviewed-by: Boris Brezillon <[email protected]> Reviewed-by: Simona Vetter <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ee2a06b commit 85fb1ed

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

include/drm/drm_gem.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,7 @@ static inline bool drm_gem_object_is_shared_for_memory_stats(struct drm_gem_obje
580580
*/
581581
static inline bool drm_gem_is_imported(const struct drm_gem_object *obj)
582582
{
583-
/* The dma-buf's priv field points to the original GEM object. */
584-
return obj->dma_buf && (obj->dma_buf->priv != obj);
583+
return !!obj->import_attach;
585584
}
586585

587586
#ifdef CONFIG_LOCKDEP

0 commit comments

Comments
 (0)