Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/vmwgfx: Fix a couple of sparse warnings and errors

Introduced with 3.14-rc1

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>

+13 -14
+3 -6
drivers/gpu/drm/vmwgfx/vmwgfx_context.c
··· 551 551 cmd->header.size = sizeof(cmd->body); 552 552 cmd->body.cid = bi->ctx->id; 553 553 cmd->body.type = bi->i1.shader_type; 554 - cmd->body.shid = 555 - cpu_to_le32((rebind) ? bi->res->id : SVGA3D_INVALID_ID); 554 + cmd->body.shid = ((rebind) ? bi->res->id : SVGA3D_INVALID_ID); 556 555 vmw_fifo_commit(dev_priv, sizeof(*cmd)); 557 556 558 557 return 0; ··· 584 585 cmd->header.size = sizeof(cmd->body); 585 586 cmd->body.cid = bi->ctx->id; 586 587 cmd->body.type = bi->i1.rt_type; 587 - cmd->body.target.sid = 588 - cpu_to_le32((rebind) ? bi->res->id : SVGA3D_INVALID_ID); 588 + cmd->body.target.sid = ((rebind) ? bi->res->id : SVGA3D_INVALID_ID); 589 589 cmd->body.target.face = 0; 590 590 cmd->body.target.mipmap = 0; 591 591 vmw_fifo_commit(dev_priv, sizeof(*cmd)); ··· 626 628 cmd->body.c.cid = bi->ctx->id; 627 629 cmd->body.s1.stage = bi->i1.texture_stage; 628 630 cmd->body.s1.name = SVGA3D_TS_BIND_TEXTURE; 629 - cmd->body.s1.value = 630 - cpu_to_le32((rebind) ? bi->res->id : SVGA3D_INVALID_ID); 631 + cmd->body.s1.value = ((rebind) ? bi->res->id : SVGA3D_INVALID_ID); 631 632 vmw_fifo_commit(dev_priv, sizeof(*cmd)); 632 633 633 634 return 0;
+1 -1
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
··· 602 602 { 603 603 struct vmw_cid_cmd { 604 604 SVGA3dCmdHeader header; 605 - __le32 cid; 605 + uint32_t cid; 606 606 } *cmd; 607 607 608 608 cmd = container_of(header, struct vmw_cid_cmd, header);
+9 -7
drivers/gpu/drm/vmwgfx/vmwgfx_shader.c
··· 371 371 TTM_REF_USAGE); 372 372 } 373 373 374 - int vmw_shader_alloc(struct vmw_private *dev_priv, 375 - struct vmw_dma_buffer *buffer, 376 - size_t shader_size, 377 - size_t offset, 378 - SVGA3dShaderType shader_type, 379 - struct ttm_object_file *tfile, 380 - u32 *handle) 374 + static int vmw_shader_alloc(struct vmw_private *dev_priv, 375 + struct vmw_dma_buffer *buffer, 376 + size_t shader_size, 377 + size_t offset, 378 + SVGA3dShaderType shader_type, 379 + struct ttm_object_file *tfile, 380 + u32 *handle) 381 381 { 382 382 struct vmw_user_shader *ushader; 383 383 struct vmw_resource *res, *tmp; ··· 779 779 int ret; 780 780 781 781 man = kzalloc(sizeof(*man), GFP_KERNEL); 782 + if (man == NULL) 783 + return ERR_PTR(-ENOMEM); 782 784 783 785 man->dev_priv = dev_priv; 784 786 INIT_LIST_HEAD(&man->list);