drm: Branch 'master' - 2 commits

 freedreno/freedreno_drmif.h    |    4 ++--
 freedreno/msm/msm_ringbuffer.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit feb1b39be164019ca47b5d3923873a39d7dd0d77
Author: Rob Clark <[email protected]>
Date:   Thu Jul 21 13:59:53 2016 -0400

    freedreno: fix warnings
    
    Signed-off-by: Rob Clark <[email protected]>
    Tested-by: Rob Herring <[email protected]>

diff --git a/freedreno/msm/msm_ringbuffer.c b/freedreno/msm/msm_ringbuffer.c
index fbfaefa..a78806c 100644
--- a/freedreno/msm/msm_ringbuffer.c
+++ b/freedreno/msm/msm_ringbuffer.c
@@ -232,10 +232,10 @@ static uint32_t bo2idx(struct fd_ringbuffer *ring, struct fd_bo *bo, uint32_t fl
 
 		if (!drmHashLookup(msm_ring->bo_table, bo->handle, &val)) {
 			/* found */
-			idx = (uint32_t)val;
+			idx = (uint32_t)(uintptr_t)val;
 		} else {
 			idx = append_bo(ring, bo);
-			val = (void *)idx;
+			val = (void *)(uintptr_t)idx;
 			drmHashInsert(msm_ring->bo_table, bo->handle, val);
 		}
 		msm_bo->current_ring_seqno = msm_ring->seqno;
commit 1f1b61d49128716f9808be23af20f54f1c26a573
Author: Rob Clark <[email protected]>
Date:   Thu Jul 21 13:19:35 2016 -0400

    freedreno: fix android build break
    
    The 'deprecated' #define was causing problems with bionic system headers
    which used __attribute__((deprecated)).
    
    Signed-off-by: Rob Clark <[email protected]>
    Tested-by: Rob Herring <[email protected]>

diff --git a/freedreno/freedreno_drmif.h b/freedreno/freedreno_drmif.h
index af5e1da..2d913e6 100644
--- a/freedreno/freedreno_drmif.h
+++ b/freedreno/freedreno_drmif.h
@@ -33,9 +33,9 @@
 #include <stdint.h>
 
 #if defined(__GNUC__)
-#  define deprecated __attribute__((__deprecated__))
+#  define drm_deprecated __attribute__((__deprecated__))
 #else
-#  define deprecated
+#  define drm_deprecated
 #endif
 
 /* an empty marker for things that will be deprecated in the future: */

------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are 
consuming the most bandwidth. Provides multi-vendor support for NetFlow, 
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports.http://sdm.link/zohodev2dev
--