drm: Branch 'master'

[email protected] (Eric Engestr??m) Fri, 15 Sep 2017 16:08:49 +0000 (UTC)
Newsgroups gmane.comp.video.dri.patches
Message-ID <[email protected]>
 freedreno/kgsl/kgsl_ringbuffer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 76418c244d4c52a8dd20809e3e8b4e70501fc76f
Author: Eric Engestrom <[email protected]>
Date:   Thu Sep 14 10:56:01 2017 +0100

    freedreno/kgsl: fix pointer-to-int cast
    
    Fixes this warning:
    
    freedreno/kgsl/kgsl_ringbuffer.c: In function ‘kgsl_ringbuffer_flush’:
    freedreno/kgsl/kgsl_ringbuffer.c:149:19: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
       req.timestamp = (uint32_t)kgsl_ring->bo->hostptr;
                       ^
    
    Signed-off-by: Eric Engestrom <[email protected]>
    Reviewed-by: Rob Clark <[email protected]>

diff --git a/freedreno/kgsl/kgsl_ringbuffer.c b/freedreno/kgsl/kgsl_ringbuffer.c
index e4696b1b..f09c433b 100644
--- a/freedreno/kgsl/kgsl_ringbuffer.c
+++ b/freedreno/kgsl/kgsl_ringbuffer.c
@@ -146,7 +146,7 @@ static int kgsl_ringbuffer_flush(struct fd_ringbuffer *ring, uint32_t *last_star
 		ibdesc.gpuaddr = kgsl_ring->bo->gpuaddr;
 		ibdesc.hostptr = kgsl_ring->bo->hostptr;
 		ibdesc.sizedwords = 0x145;
-		req.timestamp = (uint32_t)kgsl_ring->bo->hostptr;
+		req.timestamp = (uintptr_t)kgsl_ring->bo->hostptr;
 	}
 
 	do {

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

--
_______________________________________________
Dri-patches mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dri-patches