Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e7c875d authored by Paul Bolle's avatar Paul Bolle Committed by Daniel Vetter
Browse files

drm/vmwgfx: use *_32_bits() macros 



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: default avatarPaul Bolle <pebolle@tiscali.nl>
Acked-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1457000770-2317-1-git-send-email-pebolle@tiscali.nl
parent db5dfef7

drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -293,13 +293,10 @@ static int vmw_cmdbuf_header_submit(struct vmw_cmdbuf_header *header) 
	struct vmw_cmdbuf_man *man = header->man;

	struct vmw_cmdbuf_man *man = header->man;

	u32 val;

	u32 val;





	if (sizeof(header->handle) > 4)

	val = upper_32_bits(header->handle);

		val = (header->handle >> 32);

	else

		val = 0;

	vmw_write(man->dev_priv, SVGA_REG_COMMAND_HIGH, val);

	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;

	val |= header->cb_context & SVGA_CB_CONTEXT_MASK;

	vmw_write(man->dev_priv, SVGA_REG_COMMAND_LOW, val);

	vmw_write(man->dev_priv, SVGA_REG_COMMAND_LOW, val);