drm: Branch 'master'

 freedreno/freedreno_ringbuffer.h |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 22b3efbe9b6ba4d0d35dba64c27a8ebd920140d3
Author: Rob Clark <[email protected]>
Date:   Mon Jun 18 13:05:01 2018 -0400

    freedreno: add user ptr to fd_ringbuffer
    
    Something for users of fd_ringbuffer to use as they see fit.  (For now,
    just so mesa can add some debugging state.)
    
    Signed-off-by: Rob Clark <[email protected]>

diff --git a/freedreno/freedreno_ringbuffer.h b/freedreno/freedreno_ringbuffer.h
index c501fbad..0a3d6f77 100644
--- a/freedreno/freedreno_ringbuffer.h
+++ b/freedreno/freedreno_ringbuffer.h
@@ -47,6 +47,11 @@ struct fd_ringbuffer {
 	const struct fd_ringbuffer_funcs *funcs;
 	uint32_t last_timestamp;
 	struct fd_ringbuffer *parent;
+
+	/* for users of fd_ringbuffer to store their own private per-
+	 * ringbuffer data
+	 */
+	void *user;
 };
 
 struct fd_ringbuffer * fd_ringbuffer_new(struct fd_pipe *pipe,

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--