drm/vmwgfx: use *_32_bits() macros
authorPaul Bolle <pebolle@tiscali.nl>
Thu, 3 Mar 2016 10:26:10 +0000 (11:26 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 15 Jun 2016 11:10:38 +0000 (13:10 +0200)
Use the upper_32_bits() macro instead of the four line equivalent that
triggers a GCC warning on 32 bits x86:
    drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c: In function 'vmw_cmdbuf_header_submit':
    drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c:297:25: warning: right shift count >= width of type [-Wshift-count-overflow]
       val = (header->handle >> 32);
                             ^

And use the lower_32_bits() macro instead of and-ing with a 32 bits
mask.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Acked-by: Joe Perches <joe@perches.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1457000770-2317-1-git-send-email-pebolle@tiscali.nl
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c

index 67cebb2..aa04fb0 100644 (file)
@@ -293,13 +293,10 @@ static int vmw_cmdbuf_header_submit(struct vmw_cmdbuf_header *header)
        struct vmw_cmdbuf_man *man = header->man;
        u32 val;
 
-       if (sizeof(header->handle) > 4)
-               val = (header->handle >> 32);
-       else
-               val = 0;
+       val = upper_32_bits(header->handle);
        vmw_write(man->dev_priv, SVGA_REG_COMMAND_HIGH, val);
 
-       val = (header->handle & 0xFFFFFFFFULL);
+       val = lower_32_bits(header->handle);
        val |= header->cb_context & SVGA_CB_CONTEXT_MASK;
        vmw_write(man->dev_priv, SVGA_REG_COMMAND_LOW, val);