aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSouptick Joarder <jrdr.linux@gmail.com>2016-12-01 14:55:45 -0500
committerSinclair Yeh <syeh@vmware.com>2017-07-18 02:40:56 -0400
commita02f6da66557bab10271fa5017aff29fa647e830 (patch)
tree69d0f72842dab30431c4549c00e79fd63dae4664
parentd7f482313322892b28f3c14958177cd15c6a113d (diff)
drm/vmwgfx: Use dma_pool_zalloc
We should use dma_pool_zalloc instead of dma_pool_alloc/memset Signed-off-by: Souptick joarder <jrdr.linux@gmail.com> Reviewed-by: Sinclair Yeh <syeh@vmware.com> Signed-off-by: Sinclair Yeh <syeh@vmware.com>
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
index 77cb7c627e09..2e3c8479181f 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
@@ -778,8 +778,8 @@ static int vmw_cmdbuf_space_pool(struct vmw_cmdbuf_man *man,
778 if (ret) 778 if (ret)
779 return ret; 779 return ret;
780 780
781 header->cb_header = dma_pool_alloc(man->headers, GFP_KERNEL, 781 header->cb_header = dma_pool_zalloc(man->headers, GFP_KERNEL,
782 &header->handle); 782 &header->handle);
783 if (!header->cb_header) { 783 if (!header->cb_header) {
784 ret = -ENOMEM; 784 ret = -ENOMEM;
785 goto out_no_cb_header; 785 goto out_no_cb_header;
@@ -789,7 +789,6 @@ static int vmw_cmdbuf_space_pool(struct vmw_cmdbuf_man *man,
789 cb_hdr = header->cb_header; 789 cb_hdr = header->cb_header;
790 offset = header->node.start << PAGE_SHIFT; 790 offset = header->node.start << PAGE_SHIFT;
791 header->cmd = man->map + offset; 791 header->cmd = man->map + offset;
792 memset(cb_hdr, 0, sizeof(*cb_hdr));
793 if (man->using_mob) { 792 if (man->using_mob) {
794 cb_hdr->flags = SVGA_CB_FLAG_MOB; 793 cb_hdr->flags = SVGA_CB_FLAG_MOB;
795 cb_hdr->ptr.mob.mobid = man->cmd_space->mem.start; 794 cb_hdr->ptr.mob.mobid = man->cmd_space->mem.start;
@@ -826,8 +825,8 @@ static int vmw_cmdbuf_space_inline(struct vmw_cmdbuf_man *man,
826 if (WARN_ON_ONCE(size > VMW_CMDBUF_INLINE_SIZE)) 825 if (WARN_ON_ONCE(size > VMW_CMDBUF_INLINE_SIZE))
827 return -ENOMEM; 826 return -ENOMEM;
828 827
829 dheader = dma_pool_alloc(man->dheaders, GFP_KERNEL, 828 dheader = dma_pool_zalloc(man->dheaders, GFP_KERNEL,
830 &header->handle); 829 &header->handle);
831 if (!dheader) 830 if (!dheader)
832 return -ENOMEM; 831 return -ENOMEM;
833 832
@@ -836,7 +835,6 @@ static int vmw_cmdbuf_space_inline(struct vmw_cmdbuf_man *man,
836 cb_hdr = &dheader->cb_header; 835 cb_hdr = &dheader->cb_header;
837 header->cb_header = cb_hdr; 836 header->cb_header = cb_hdr;
838 header->cmd = dheader->cmd; 837 header->cmd = dheader->cmd;
839 memset(dheader, 0, sizeof(*dheader));
840 cb_hdr->status = SVGA_CB_STATUS_NONE; 838 cb_hdr->status = SVGA_CB_STATUS_NONE;
841 cb_hdr->flags = SVGA_CB_FLAG_NONE; 839 cb_hdr->flags = SVGA_CB_FLAG_NONE;
842 cb_hdr->ptr.pa = (u64)header->handle + 840 cb_hdr->ptr.pa = (u64)header->handle +