geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
main
Rob Clark 2018-10-09 08:24:06 -04:00
parent f9dadcece6
commit 566b1d9f93
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
freedreno/msm/msm_ringbuffer.c
View File

@ -106,8 +106,7 @@ static pthread_mutex_t idx_lock = PTHREAD_MUTEX_INITIALIZER;
static void ring_cmd_del(struct msm_cmd *cmd) 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); list_del(&cmd->list);
to_msm_ringbuffer(cmd->ring)->cmd_count--; to_msm_ringbuffer(cmd->ring)->cmd_count--;
free(cmd->relocs); 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) { if (msm_cmd->ring->flags & FD_RINGBUFFER_OBJECT) {
/* we could have dropped last reference: */ /* we could have dropped last reference: */
msm_ring->cmds[i] = NULL; 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); msm_ringbuffer_unref(msm_cmd->ring);
free(U642VOID(cmd->relocs)); free(U642VOID(cmd->relocs));
} }