From 83085a8f395fd0102ef0af2fee2c21bfd626f084 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Fri, 18 Jun 2021 09:53:22 -0700 Subject: [PATCH] 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 Part-of: --- src/freedreno/drm/freedreno_bo.c | 6 +++--- src/freedreno/drm/freedreno_bo_cache.c | 2 +- src/freedreno/drm/freedreno_priv.h | 2 +- src/freedreno/drm/msm_ringbuffer.c | 2 +- src/freedreno/drm/msm_ringbuffer_sp.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/freedreno/drm/freedreno_bo.c b/src/freedreno/drm/freedreno_bo.c index 0c4d54f23c1..8ff10705d1d 100644 --- a/src/freedreno/drm/freedreno_bo.c +++ b/src/freedreno/drm/freedreno_bo.c @@ -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 diff --git a/src/freedreno/drm/freedreno_bo_cache.c b/src/freedreno/drm/freedreno_bo_cache.c index 6a028d9ae40..618f4b127c1 100644 --- a/src/freedreno/drm/freedreno_bo_cache.c +++ b/src/freedreno/drm/freedreno_bo_cache.c @@ -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; } } diff --git a/src/freedreno/drm/freedreno_priv.h b/src/freedreno/drm/freedreno_priv.h index 6e3c610ee00..dab9296b174 100644 --- a/src/freedreno/drm/freedreno_priv.h +++ b/src/freedreno/drm/freedreno_priv.h @@ -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; diff --git a/src/freedreno/drm/msm_ringbuffer.c b/src/freedreno/drm/msm_ringbuffer.c index 3520b886e33..43bd83937e5 100644 --- a/src/freedreno/drm/msm_ringbuffer.c +++ b/src/freedreno/drm/msm_ringbuffer.c @@ -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, }); diff --git a/src/freedreno/drm/msm_ringbuffer_sp.c b/src/freedreno/drm/msm_ringbuffer_sp.c index 3604e3d6473..1d7e7b94967 100644 --- a/src/freedreno/drm/msm_ringbuffer_sp.c +++ b/src/freedreno/drm/msm_ringbuffer_sp.c @@ -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; }