| Message ID | 20250317131923.238374-15-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm: Do not use import_attach in drivers | expand |
On Mon, Mar 17, 2025 at 9:22 AM Thomas Zimmermann <tzimmermann@suse.de> wrote: > > 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: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Zack Rusin <zack.rusin@broadcom.com> > Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com> > --- > drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c > index 200240fecf7d..2a252e1d5e9f 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c > @@ -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); > } > -- > 2.48.1 > Looks good, thanks! Reviewed-by: Zack Rusin <zack.rusin@broadcom.com> z
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c index 200240fecf7d..2a252e1d5e9f 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gem.c @@ -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); }
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: Thomas Zimmermann <tzimmermann@suse.de> Cc: Zack Rusin <zack.rusin@broadcom.com> Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com> --- drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)