projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
freedreno: Start moving relocs flags into the BOs.
[mesa.git]
/
src
/
freedreno
/
drm
/
msm_ringbuffer.c
diff --git
a/src/freedreno/drm/msm_ringbuffer.c
b/src/freedreno/drm/msm_ringbuffer.c
index 5e033b3d6ac16646edba792d79e24015293878ea..8a15c559bb6b4560e5f7b194a3d5191db04d3f54 100644
(file)
--- a/
src/freedreno/drm/msm_ringbuffer.c
+++ b/
src/freedreno/drm/msm_ringbuffer.c
@@
-162,7
+162,7
@@
append_bo(struct msm_submit *submit, struct fd_bo *bo, uint32_t flags)
idx = APPEND(submit, submit_bos);
idx = APPEND(submit, bos);
idx = APPEND(submit, submit_bos);
idx = APPEND(submit, bos);
- submit->submit_bos[idx].flags =
0
;
+ submit->submit_bos[idx].flags =
bo->flags
;
submit->submit_bos[idx].handle = bo->handle;
submit->submit_bos[idx].presumed = 0;
submit->submit_bos[idx].handle = bo->handle;
submit->submit_bos[idx].presumed = 0;
@@
-174,8
+174,6
@@
append_bo(struct msm_submit *submit, struct fd_bo *bo, uint32_t flags)
msm_bo->idx = idx;
}
msm_bo->idx = idx;
}
- if (flags & FD_RELOC_READ)
- submit->submit_bos[idx].flags |= MSM_SUBMIT_BO_READ;
if (flags & FD_RELOC_WRITE)
submit->submit_bos[idx].flags |= MSM_SUBMIT_BO_WRITE;
if (flags & FD_RELOC_WRITE)
submit->submit_bos[idx].flags |= MSM_SUBMIT_BO_WRITE;
@@
-283,8
+281,6
@@
handle_stateobj_relocs(struct msm_submit *submit, struct msm_ringbuffer *ring)
struct fd_bo *bo = ring->u.reloc_bos[idx].bo;
unsigned flags = 0;
struct fd_bo *bo = ring->u.reloc_bos[idx].bo;
unsigned flags = 0;
- if (ring->u.reloc_bos[idx].flags & MSM_SUBMIT_BO_READ)
- flags |= FD_RELOC_READ;
if (ring->u.reloc_bos[idx].flags & MSM_SUBMIT_BO_WRITE)
flags |= FD_RELOC_WRITE;
if (ring->u.reloc_bos[idx].flags & MSM_SUBMIT_BO_WRITE)
flags |= FD_RELOC_WRITE;
@@
-347,7
+343,7
@@
msm_submit_flush(struct fd_submit *submit, int in_fence_fd,
cmds[i].type = MSM_SUBMIT_CMD_IB_TARGET_BUF;
cmds[i].submit_idx =
cmds[i].type = MSM_SUBMIT_CMD_IB_TARGET_BUF;
cmds[i].submit_idx =
- append_bo(msm_submit, msm_ring->ring_bo,
FD_RELOC_READ
);
+ append_bo(msm_submit, msm_ring->ring_bo,
0
);
cmds[i].submit_offset = msm_ring->offset;
cmds[i].size = offset_bytes(ring->cur, ring->start);
cmds[i].pad = 0;
cmds[i].submit_offset = msm_ring->offset;
cmds[i].size = offset_bytes(ring->cur, ring->start);
cmds[i].pad = 0;
@@
-363,7
+359,7
@@
msm_submit_flush(struct fd_submit *submit, int in_fence_fd,
cmds[i].type = MSM_SUBMIT_CMD_IB_TARGET_BUF;
}
cmds[i].submit_idx = append_bo(msm_submit,
cmds[i].type = MSM_SUBMIT_CMD_IB_TARGET_BUF;
}
cmds[i].submit_idx = append_bo(msm_submit,
- msm_ring->u.cmds[j]->ring_bo,
FD_RELOC_READ
);
+ msm_ring->u.cmds[j]->ring_bo,
0
);
cmds[i].submit_offset = msm_ring->offset;
cmds[i].size = msm_ring->u.cmds[j]->size;
cmds[i].pad = 0;
cmds[i].submit_offset = msm_ring->offset;
cmds[i].size = msm_ring->u.cmds[j]->size;
cmds[i].pad = 0;
@@
-607,7
+603,7
@@
msm_ringbuffer_emit_reloc_ring(struct fd_ringbuffer *ring,
msm_ringbuffer_emit_reloc(ring, &(struct fd_reloc){
.bo = bo,
msm_ringbuffer_emit_reloc(ring, &(struct fd_reloc){
.bo = bo,
- .flags =
FD_RELOC_READ
,
+ .flags =
0
,
.offset = msm_target->offset,
});
.offset = msm_target->offset,
});