Commit 5214c28b authored by Eric Anholt's avatar Eric Anholt Committed by Greg Kroah-Hartman

drm/v3d: Fix prime imports of buffers from other drivers.

[ Upstream commit 62d1a752 ]

v3d_bo_get_pages() checks this to decide to map the imported buffer
instead of the backing shmem file.  The caller was about to set this
value anyway, and there's no error path in between.  Ideally we
wouldn't even allocate the shmem file for our imports, but that's a
more invasive fix.
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Fixes: 57692c94 ("drm/v3d: Introduce a new DRM driver for Broadcom V3D V3.x+")
Link: https://patchwork.freedesktop.org/patch/msgid/20181128230927.10951-3-eric@anholt.netAcked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarDave Emett <david.emett@broadcom.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 14743f85
...@@ -293,6 +293,7 @@ v3d_prime_import_sg_table(struct drm_device *dev, ...@@ -293,6 +293,7 @@ v3d_prime_import_sg_table(struct drm_device *dev,
bo->resv = attach->dmabuf->resv; bo->resv = attach->dmabuf->resv;
bo->sgt = sgt; bo->sgt = sgt;
obj->import_attach = attach;
v3d_bo_get_pages(bo); v3d_bo_get_pages(bo);
v3d_mmu_insert_ptes(bo); v3d_mmu_insert_ptes(bo);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment