aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2018-11-28 15:09:27 -0800
committerEric Anholt <[email protected]>2018-11-30 13:47:34 -0800
commit62d1a752874962f072de8a779e960fcd2ab4847b (patch)
treeb3129f3cf471592d619d7cce13f400b95a93053a
parente14a07fc4b961a75f6c275d6bd670ba54fbdae14 (diff)
drm/v3d: Fix prime imports of buffers from other drivers.
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: Eric Anholt <[email protected]> Fixes: 57692c94dcbe ("drm/v3d: Introduce a new DRM driver for Broadcom V3D V3.x+") Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Acked-by: Daniel Vetter <[email protected]> Reviewed-by: Dave Emett <[email protected]>
-rw-r--r--drivers/gpu/drm/v3d/v3d_bo.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/v3d/v3d_bo.c b/drivers/gpu/drm/v3d/v3d_bo.c
index 54d96518a131..a08766d39eab 100644
--- a/drivers/gpu/drm/v3d/v3d_bo.c
+++ b/drivers/gpu/drm/v3d/v3d_bo.c
@@ -293,6 +293,7 @@ v3d_prime_import_sg_table(struct drm_device *dev,
bo->resv = attach->dmabuf->resv;
bo->sgt = sgt;
+ obj->import_attach = attach;
v3d_bo_get_pages(bo);
v3d_mmu_insert_ptes(bo);