Commit aec8a402 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/vmwgfx: Use dma_buf from GEM object instance 



Avoid dereferencing struct drm_gem_object.import_attach for the
imported dma-buf. The dma_buf field in the GEM object instance refers
to the same buffer. Prepares to make import_attach optional.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Zack Rusin <zack.rusin@broadcom.com>
Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
Reviewed-by: default avatarZack Rusin <zack.rusin@broadcom.com>
Link: https://lore.kernel.org/r/20250317131923.238374-15-tzimmermann@suse.de
parent 5a80b00d

drivers/gpu/drm/vmwgfx/vmwgfx_gem.c

+3 −3
Original line number Diff line number Diff line
@@ -85,10 +85,10 @@ static int vmw_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map) 
	int ret;



	if (drm_gem_is_imported(obj)) {

		ret = dma_buf_vmap(obj->import_attach->dmabuf, map);

		ret = dma_buf_vmap(obj->dma_buf, map);

		if (!ret) {

			if (drm_WARN_ON(obj->dev, map->is_iomem)) {

				dma_buf_vunmap(obj->import_attach->dmabuf, map);

				dma_buf_vunmap(obj->dma_buf, map);

				return -EIO;

			}

		}
@@ -102,7 +102,7 @@ static int vmw_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map) 
static void vmw_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map)

{

	if (drm_gem_is_imported(obj))

		dma_buf_vunmap(obj->import_attach->dmabuf, map);

		dma_buf_vunmap(obj->dma_buf, map);

	else

		drm_gem_ttm_vunmap(obj, map);

}