<div dir="ltr"><div>Reviewed-by: Anusha Srivatsa <<a href="mailto:asrivats@redhat.com">asrivats@redhat.com</a>></div><div><br></div><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">On Wed, Feb 26, 2025 at 12:28 PM Thomas Zimmermann <<a href="mailto:tzimmermann@suse.de">tzimmermann@suse.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Avoid dereferencing struct drm_gem_object.import_attach for the<br>
imported dma-buf. The dma_buf field in the GEM object instance refers<br>
to the same buffer. Prepares to make import_attach optional.<br>
<br>
Signed-off-by: Thomas Zimmermann <<a href="mailto:tzimmermann@suse.de" target="_blank">tzimmermann@suse.de</a>><br>
---<br>
drivers/gpu/drm/drm_gem_framebuffer_helper.c | 8 ++------<br>
1 file changed, 2 insertions(+), 6 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/drm_gem_framebuffer_helper.c b/drivers/gpu/drm/drm_gem_framebuffer_helper.c<br>
index 2bf606ba24cd..0fbeb686e561 100644<br>
--- a/drivers/gpu/drm/drm_gem_framebuffer_helper.c<br>
+++ b/drivers/gpu/drm/drm_gem_framebuffer_helper.c<br>
@@ -419,7 +419,6 @@ EXPORT_SYMBOL(drm_gem_fb_vunmap);<br>
static void __drm_gem_fb_end_cpu_access(struct drm_framebuffer *fb, enum dma_data_direction dir,<br>
unsigned int num_planes)<br>
{<br>
- struct dma_buf_attachment *import_attach;<br>
struct drm_gem_object *obj;<br>
int ret;<br>
<br>
@@ -428,10 +427,9 @@ static void __drm_gem_fb_end_cpu_access(struct drm_framebuffer *fb, enum dma_dat<br>
obj = drm_gem_fb_get_obj(fb, num_planes);<br>
if (!obj)<br>
continue;<br>
- import_attach = obj->import_attach;<br>
if (!drm_gem_is_imported(obj))<br>
continue;<br>
- ret = dma_buf_end_cpu_access(import_attach->dmabuf, dir);<br>
+ ret = dma_buf_end_cpu_access(obj->dma_buf, dir);<br>
if (ret)<br>
drm_err(fb->dev, "dma_buf_end_cpu_access(%u, %d) failed: %d\n",<br>
ret, num_planes, dir);<br>
@@ -454,7 +452,6 @@ static void __drm_gem_fb_end_cpu_access(struct drm_framebuffer *fb, enum dma_dat<br>
*/<br>
int drm_gem_fb_begin_cpu_access(struct drm_framebuffer *fb, enum dma_data_direction dir)<br>
{<br>
- struct dma_buf_attachment *import_attach;<br>
struct drm_gem_object *obj;<br>
unsigned int i;<br>
int ret;<br>
@@ -465,10 +462,9 @@ int drm_gem_fb_begin_cpu_access(struct drm_framebuffer *fb, enum dma_data_direct<br>
ret = -EINVAL;<br>
goto err___drm_gem_fb_end_cpu_access;<br>
}<br>
- import_attach = obj->import_attach;<br>
if (!drm_gem_is_imported(obj))<br>
continue;<br>
- ret = dma_buf_begin_cpu_access(import_attach->dmabuf, dir);<br>
+ ret = dma_buf_begin_cpu_access(obj->dma_buf, dir);<br>
if (ret)<br>
goto err___drm_gem_fb_end_cpu_access;<br>
}<br>
-- <br>
2.48.1<br>
<br>
</blockquote></div></div>