KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freedreno/drm: Rename bo->flags to bo->reloc_flags 

Next patch adds alloc_flags, lets rename bo->flags first to make it
clear *which* flags these are.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11176>
This commit is contained in:
Rob Clark 2021-06-18 09:53:22 -07:00 committed by Marge Bot
parent f8d2587960
commit 83085a8f39
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/freedreno/drm/freedreno_bo.c
View File

@ -77,7 +77,7 @@ bo_from_handle(struct fd_device *dev, uint32_t size, uint32_t handle)
bo->size = size;
bo->handle = handle;
bo->iova = bo->funcs->iova(bo);
bo->flags = FD_RELOC_FLAGS_INIT;
bo->reloc_flags = FD_RELOC_FLAGS_INIT;
p_atomic_set(&bo->refcnt, 1);
list_inithead(&bo->list);
@ -141,7 +141,7 @@ fd_bo_new_ring(struct fd_device *dev, uint32_t size)
struct fd_bo *bo = bo_new(dev, size, flags, &dev->ring_cache);
if (bo) {
bo->bo_reuse = RING_CACHE;
bo->flags |= FD_RELOC_DUMP;
bo->reloc_flags |= FD_RELOC_DUMP;
fd_bo_set_name(bo, "cmdstream");
}
return bo;
@ -239,7 +239,7 @@ out_unlock:
void
fd_bo_mark_for_dump(struct fd_bo *bo)
{
bo->flags |= FD_RELOC_DUMP;
bo->reloc_flags |= FD_RELOC_DUMP;
}
uint64_t

2
src/freedreno/drm/freedreno_bo_cache.c
View File

@ -174,7 +174,7 @@ retry:
goto retry;
}
p_atomic_set(&bo->refcnt, 1);
bo->flags = FD_RELOC_FLAGS_INIT;
bo->reloc_flags = FD_RELOC_FLAGS_INIT;
return bo;
}
}

2
src/freedreno/drm/freedreno_priv.h
View File

@ -284,7 +284,7 @@ struct fd_bo {
uint32_t handle;
uint32_t name;
int32_t refcnt;
uint32_t flags; /* flags like FD_RELOC_DUMP to use for relocs to this BO */
uint32_t reloc_flags; /* flags like FD_RELOC_DUMP to use for relocs to this BO */
uint64_t iova;
void *map;
const struct fd_bo_funcs *funcs;

2
src/freedreno/drm/msm_ringbuffer.c
View File

@ -149,7 +149,7 @@ append_bo(struct msm_submit *submit, struct fd_bo *bo)
idx = APPEND(
submit, submit_bos,
(struct drm_msm_gem_submit_bo){
.flags = bo->flags & (MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_WRITE),
.flags = bo->reloc_flags & (MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_WRITE),
.handle = bo->handle,
.presumed = 0,
});

2
src/freedreno/drm/msm_ringbuffer_sp.c
View File

@ -366,7 +366,7 @@ flush_submit_list(struct list_head *submit_list)
}
for (unsigned i = 0; i < msm_submit->nr_bos; i++) {
submit_bos[i].flags = msm_submit->bos[i]->flags;
submit_bos[i].flags = msm_submit->bos[i]->reloc_flags;
submit_bos[i].handle = msm_submit->bos[i]->handle;
submit_bos[i].presumed = 0;
}