diff options
| author | Rob Clark <robclark@freedesktop.org> | 2018-10-09 08:24:06 -0400 |
|---|---|---|
| committer | Rob Clark <robclark@freedesktop.org> | 2018-10-13 17:12:22 -0400 |
| commit | 566b1d9f93e4922edf5b13b80cb46179e9d85802 (patch) | |
| tree | ddcfebd20764b91b8aa58c7941b1ed970080e5ed | |
| parent | f9dadcece665cdbd4584febf845334db866b57f7 (diff) | |
| download | libdrm-566b1d9f93e4922edf5b13b80cb46179e9d85802.tar.gz libdrm-566b1d9f93e4922edf5b13b80cb46179e9d85802.tar.bz2 libdrm-566b1d9f93e4922edf5b13b80cb46179e9d85802.zip | |
freedreno/msm: get rid of ring_bo unref hack
Since 28328298 'freedreno: move ring_cache behind fd_bo_del()' this hack
is no longer necessary.
Signed-off-by: Rob Clark <robclark@freedesktop.org>
| -rw-r--r-- | freedreno/msm/msm_ringbuffer.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/freedreno/msm/msm_ringbuffer.c b/freedreno/msm/msm_ringbuffer.c index ac6221c2..5a088818 100644 --- a/freedreno/msm/msm_ringbuffer.c +++ b/freedreno/msm/msm_ringbuffer.c @@ -106,8 +106,7 @@ static pthread_mutex_t idx_lock = PTHREAD_MUTEX_INITIALIZER; static void ring_cmd_del(struct msm_cmd *cmd) { - if (cmd->ring_bo) - fd_bo_del(cmd->ring_bo); + fd_bo_del(cmd->ring_bo); list_del(&cmd->list); to_msm_ringbuffer(cmd->ring)->cmd_count--; free(cmd->relocs); @@ -455,14 +454,6 @@ static int msm_ringbuffer_flush(struct fd_ringbuffer *ring, uint32_t *last_start if (msm_cmd->ring->flags & FD_RINGBUFFER_OBJECT) { /* we could have dropped last reference: */ msm_ring->cmds[i] = NULL; - - /* need to drop ring_bo ref prior to unref'ing the ring, - * because ring_bo_del assumes it is dropping the *last* - * reference: - */ - fd_bo_del(msm_ring->bos[cmd->submit_idx]); - msm_ring->bos[cmd->submit_idx] = NULL; - msm_ringbuffer_unref(msm_cmd->ring); free(U642VOID(cmd->relocs)); } |