lkml.org 
[lkml]   [2018]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 121/193] drm/vmwgfx: use *_32_bits() macros
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Paul Bolle <pebolle@tiscali.nl>

    commit 0e7c875d1ae9dcf4d8c6018a45e5529feaef8956 upstream.

    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
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
    @@ -293,13 +293,10 @@ static int vmw_cmdbuf_header_submit(stru
    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);


    \
     
     \ /
      Last update: 2018-02-23 19:40    [W:2.306 / U:0.508 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site