diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-21 15:20:55 (GMT) |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2016-03-07 14:37:01 (GMT) |
| commit | 8779aa8f8b7fa397a0abe9e6af3334ea41e15836 (patch) | |
| tree | dee6d6d72cc751324eff34863b73fdac762d60b8 /drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | |
| parent | b6325f409959c7e1065ef1537f2e54cf4d7ab465 (diff) | |
| download | linux-8779aa8f8b7fa397a0abe9e6af3334ea41e15836.tar.xz | |
drm: etnaviv: clean up submit_bo()
As we now store the etnaviv_vram_mapping, we no longer need to store
the iova itself: we can get this directly from the mapping structure.
Arrange for submit_bo() to return a pointer to etnaviv_gem_submit_bo,
and directly access mapping->iova when applying relocations.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c index a5c7f79..236ada9 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c @@ -190,7 +190,6 @@ static void submit_unpin_objects(struct etnaviv_gem_submit *submit) if (submit->bos[i].flags & BO_PINNED) etnaviv_gem_mapping_unreference(submit->bos[i].mapping); - submit->bos[i].iova = 0; submit->bos[i].mapping = NULL; submit->bos[i].flags &= ~BO_PINNED; } @@ -213,14 +212,13 @@ static int submit_pin_objects(struct etnaviv_gem_submit *submit) submit->bos[i].flags |= BO_PINNED; submit->bos[i].mapping = mapping; - submit->bos[i].iova = mapping->iova; } return ret; } static int submit_bo(struct etnaviv_gem_submit *submit, u32 idx, - struct etnaviv_gem_object **obj, u32 *iova) + struct etnaviv_gem_submit_bo **bo) { if (idx >= submit->nr_bos) { DRM_ERROR("invalid buffer index: %u (out of %u)\n", @@ -228,10 +226,7 @@ static int submit_bo(struct etnaviv_gem_submit *submit, u32 idx, return -EINVAL; } - if (obj) - *obj = submit->bos[idx].obj; - if (iova) - *iova = submit->bos[idx].iova; + *bo = &submit->bos[idx]; return 0; } @@ -247,8 +242,8 @@ static int submit_reloc(struct etnaviv_gem_submit *submit, void *stream, for (i = 0; i < nr_relocs; i++) { const struct drm_etnaviv_gem_submit_reloc *r = relocs + i; - struct etnaviv_gem_object *bobj; - u32 iova, off; + struct etnaviv_gem_submit_bo *bo; + u32 off; if (unlikely(r->flags)) { DRM_ERROR("invalid reloc flags\n"); @@ -270,17 +265,16 @@ static int submit_reloc(struct etnaviv_gem_submit *submit, void *stream, return -EINVAL; } - ret = submit_bo(submit, r->reloc_idx, &bobj, &iova); + ret = submit_bo(submit, r->reloc_idx, &bo); if (ret) return ret; - if (r->reloc_offset >= - bobj->base.size - sizeof(*ptr)) { + if (r->reloc_offset >= bo->obj->base.size - sizeof(*ptr)) { DRM_ERROR("relocation %u outside object", i); return -EINVAL; } - ptr[off] = iova + r->reloc_offset; + ptr[off] = bo->mapping->iova + r->reloc_offset; last_offset = off; } |