drm: Branch 'master' - 2 commits

 freedreno/kgsl/kgsl_ringbuffer.c |    1 +
 freedreno/msm/msm_ringbuffer.c   |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f94075c3c52aa7e1174d604c806a810d0305378b
Author: Rob Clark <[email protected]>
Date:   Sun Oct 14 11:23:17 2018 -0400

    freedreno/msm: fix c90 warning
    
    Wasn't really sure how to switch the silly -Wdeclaration-after-statement
    flag off on a per directory basis.  So make the code uglier instead.

diff --git a/freedreno/msm/msm_ringbuffer.c b/freedreno/msm/msm_ringbuffer.c
index 594c2ba9..475c65d7 100644
--- a/freedreno/msm/msm_ringbuffer.c
+++ b/freedreno/msm/msm_ringbuffer.c
@@ -486,6 +486,7 @@ static int msm_ringbuffer_flush(struct fd_ringbuffer *ring, uint32_t *last_start
 	for (i = 0; i < msm_ring->submit.nr_cmds; i++) {
 		struct msm_cmd *msm_cmd = msm_ring->cmds[i];
 		struct drm_msm_gem_submit_reloc *relocs = msm_cmd->relocs;
+		struct drm_msm_gem_submit_cmd *cmd;
 		unsigned nr_relocs = msm_cmd->nr_relocs;
 
 		/* for reusable stateobjs, the reloc table has reloc_idx that
@@ -499,7 +500,7 @@ static int msm_ringbuffer_flush(struct fd_ringbuffer *ring, uint32_t *last_start
 					relocs, nr_relocs);
 		}
 
-		struct drm_msm_gem_submit_cmd *cmd = &msm_ring->submit.cmds[i];
+		cmd = &msm_ring->submit.cmds[i];
 		cmd->relocs = VOID2U64(relocs);
 		cmd->nr_relocs = nr_relocs;
 	}
commit b730f5c8c5bcf761ff438280911c1f604c19132b
Author: Rob Clark <[email protected]>
Date:   Sun Oct 14 11:23:03 2018 -0400

    freedreno/kgsl: fix build
    
    Signed-off-by: Rob Clark <[email protected]>

diff --git a/freedreno/kgsl/kgsl_ringbuffer.c b/freedreno/kgsl/kgsl_ringbuffer.c
index 42a0e0aa..9abf0adf 100644
--- a/freedreno/kgsl/kgsl_ringbuffer.c
+++ b/freedreno/kgsl/kgsl_ringbuffer.c
@@ -28,6 +28,7 @@
 
 #include <assert.h>
 
+#include "xf86atomic.h"
 #include "freedreno_ringbuffer.h"
 #include "kgsl_priv.h"
 


--