diff mbox

gpu: vmwgfx: Use dma_pool_zalloc

Message ID 20161201195545.GA3696@jordon-HP-15-Notebook-PC (mailing list archive)
State New, archived
Headers show

Commit Message

Souptick Joarder Dec. 1, 2016, 7:55 p.m. UTC 
We should use dma_pool_zalloc instead of dma_pool_alloc/memset

Signed-off-by: Souptick joarder <jrdr.linux@gmail.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

--
1.9.1

Comments

Sinclair Yeh Dec. 2, 2016, 1:32 a.m. UTC | #1 
Applied.  Thanks.

Reviewed-by: Sinclair Yeh <syeh@vmware.com>

On Fri, Dec 02, 2016 at 01:25:45AM +0530, Souptick Joarder wrote:
> We should use dma_pool_zalloc instead of dma_pool_alloc/memset
> 
> Signed-off-by: Souptick joarder <jrdr.linux@gmail.com>
> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
> index aa04fb0..fa097cc 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
> @@ -784,8 +784,8 @@ static int vmw_cmdbuf_space_pool(struct vmw_cmdbuf_man *man,
>  	if (ret)
>  		return ret;
> 
> -	header->cb_header = dma_pool_alloc(man->headers, GFP_KERNEL,
> -					   &header->handle);
> +	header->cb_header = dma_pool_zalloc(man->headers, GFP_KERNEL,
> +					    &header->handle);
>  	if (!header->cb_header) {
>  		ret = -ENOMEM;
>  		goto out_no_cb_header;
> @@ -795,7 +795,6 @@ static int vmw_cmdbuf_space_pool(struct vmw_cmdbuf_man *man,
>  	cb_hdr = header->cb_header;
>  	offset = header->node.start << PAGE_SHIFT;
>  	header->cmd = man->map + offset;
> -	memset(cb_hdr, 0, sizeof(*cb_hdr));
>  	if (man->using_mob) {
>  		cb_hdr->flags = SVGA_CB_FLAG_MOB;
>  		cb_hdr->ptr.mob.mobid = man->cmd_space->mem.start;
> @@ -832,8 +831,8 @@ static int vmw_cmdbuf_space_inline(struct vmw_cmdbuf_man *man,
>  	if (WARN_ON_ONCE(size > VMW_CMDBUF_INLINE_SIZE))
>  		return -ENOMEM;
> 
> -	dheader = dma_pool_alloc(man->dheaders, GFP_KERNEL,
> -				 &header->handle);
> +	dheader = dma_pool_zalloc(man->dheaders, GFP_KERNEL,
> +				  &header->handle);
>  	if (!dheader)
>  		return -ENOMEM;
> 
> @@ -842,7 +841,6 @@ static int vmw_cmdbuf_space_inline(struct vmw_cmdbuf_man *man,
>  	cb_hdr = &dheader->cb_header;
>  	header->cb_header = cb_hdr;
>  	header->cmd = dheader->cmd;
> -	memset(dheader, 0, sizeof(*dheader));
>  	cb_hdr->status = SVGA_CB_STATUS_NONE;
>  	cb_hdr->flags = SVGA_CB_FLAG_NONE;
>  	cb_hdr->ptr.pa = (u64)header->handle +
> --
> 1.9.1
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
index aa04fb0..fa097cc 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c
@@ -784,8 +784,8 @@  static int vmw_cmdbuf_space_pool(struct vmw_cmdbuf_man *man,
 	if (ret)
 		return ret;

-	header->cb_header = dma_pool_alloc(man->headers, GFP_KERNEL,
-					   &header->handle);
+	header->cb_header = dma_pool_zalloc(man->headers, GFP_KERNEL,
+					    &header->handle);
 	if (!header->cb_header) {
 		ret = -ENOMEM;
 		goto out_no_cb_header;
@@ -795,7 +795,6 @@  static int vmw_cmdbuf_space_pool(struct vmw_cmdbuf_man *man,
 	cb_hdr = header->cb_header;
 	offset = header->node.start << PAGE_SHIFT;
 	header->cmd = man->map + offset;
-	memset(cb_hdr, 0, sizeof(*cb_hdr));
 	if (man->using_mob) {
 		cb_hdr->flags = SVGA_CB_FLAG_MOB;
 		cb_hdr->ptr.mob.mobid = man->cmd_space->mem.start;
@@ -832,8 +831,8 @@  static int vmw_cmdbuf_space_inline(struct vmw_cmdbuf_man *man,
 	if (WARN_ON_ONCE(size > VMW_CMDBUF_INLINE_SIZE))
 		return -ENOMEM;

-	dheader = dma_pool_alloc(man->dheaders, GFP_KERNEL,
-				 &header->handle);
+	dheader = dma_pool_zalloc(man->dheaders, GFP_KERNEL,
+				  &header->handle);
 	if (!dheader)
 		return -ENOMEM;

@@ -842,7 +841,6 @@  static int vmw_cmdbuf_space_inline(struct vmw_cmdbuf_man *man,
 	cb_hdr = &dheader->cb_header;
 	header->cb_header = cb_hdr;
 	header->cmd = dheader->cmd;
-	memset(dheader, 0, sizeof(*dheader));
 	cb_hdr->status = SVGA_CB_STATUS_NONE;
 	cb_hdr->flags = SVGA_CB_FLAG_NONE;
 	cb_hdr->ptr.pa = (u64)header->handle +