1 files changed, 9 insertions, 11 deletions

diff --git a/freedreno/msm/msm_ringbuffer.c b/freedreno/msm/msm_ringbuffer.c
index 17194f4c..a87e1b9a 100644
--- a/freedreno/msm/msm_ringbuffer.c
+++ b/freedreno/msm/msm_ringbuffer.c
@@ -26,10 +26,6 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <assert.h>
 #include <inttypes.h>
 
@@ -401,6 +397,7 @@ static int msm_ringbuffer_flush(struct fd_ringbuffer *ring, uint32_t *last_start
         struct msm_ringbuffer *msm_ring = to_msm_ringbuffer(ring);
         struct drm_msm_gem_submit req = {
                         .flags = to_msm_pipe(ring->pipe)->pipe,
+                        .queueid = to_msm_pipe(ring->pipe)->queue_id,
         };
         uint32_t i;
         int ret;
@@ -496,11 +493,16 @@ static void msm_ringbuffer_emit_reloc(struct fd_ringbuffer *ring,
         if (ring->pipe->gpu_id >= 500) {
                 struct drm_msm_gem_submit_reloc *reloc_hi;
 
+                /* NOTE: grab reloc_idx *before* APPEND() since that could
+                 * realloc() meaning that 'reloc' ptr is no longer valid:
+                 */
+                uint32_t reloc_idx = reloc->reloc_idx;
+
                 idx = APPEND(cmd, relocs);
 
                 reloc_hi = &cmd->relocs[idx];
 
-                reloc_hi->reloc_idx = reloc->reloc_idx;
+                reloc_hi->reloc_idx = reloc_idx;
                 reloc_hi->reloc_offset = r->offset;
                 reloc_hi->or = r->orhi;
                 reloc_hi->shift = r->shift - 32;
@@ -584,12 +586,12 @@ drm_private struct fd_ringbuffer * msm_ringbuffer_new(struct fd_pipe *pipe,
                 uint32_t size)
 {
         struct msm_ringbuffer *msm_ring;
-        struct fd_ringbuffer *ring = NULL;
+        struct fd_ringbuffer *ring;
 
         msm_ring = calloc(1, sizeof(*msm_ring));
         if (!msm_ring) {
                 ERROR_MSG("allocation failed");
-                goto fail;
+                return NULL;
         }
 
         if (size == 0) {
@@ -609,8 +611,4 @@ drm_private struct fd_ringbuffer * msm_ringbuffer_new(struct fd_pipe *pipe,
         ring_cmd_new(ring, size);
 
         return ring;
-fail:
-        if (ring)
-                fd_ringbuffer_del(ring);
-        return NULL;
 }