| Message ID | 20181023040222.GA1540@jordon-HP-15-Notebook-PC (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/drm_pci.c: Use dma_zalloc_coherent | expand |
On Tue, Oct 23, 2018 at 09:32:22AM +0530, Souptick Joarder wrote: > Replace dma_alloc_coherent + memset with dma_zalloc_coherent. > > Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com> Applied, thanks for your patch. -Daniel > --- > drivers/gpu/drm/drm_pci.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c > index 896e42a..1427879 100644 > --- a/drivers/gpu/drm/drm_pci.c > +++ b/drivers/gpu/drm/drm_pci.c > @@ -61,15 +61,14 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali > return NULL; > > dmah->size = size; > - dmah->vaddr = dma_alloc_coherent(&dev->pdev->dev, size, &dmah->busaddr, GFP_KERNEL | __GFP_COMP); > + dmah->vaddr = dma_zalloc_coherent(&dev->pdev->dev, size, &dmah->busaddr, > + GFP_KERNEL | __GFP_COMP); > > if (dmah->vaddr == NULL) { > kfree(dmah); > return NULL; > } > > - memset(dmah->vaddr, 0, size); > - > /* XXX - Is virt_to_page() legal for consistent mem? */ > /* Reserve */ > for (addr = (unsigned long)dmah->vaddr, sz = size; > -- > 1.9.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 896e42a..1427879 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -61,15 +61,14 @@ drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t ali return NULL; dmah->size = size; - dmah->vaddr = dma_alloc_coherent(&dev->pdev->dev, size, &dmah->busaddr, GFP_KERNEL | __GFP_COMP); + dmah->vaddr = dma_zalloc_coherent(&dev->pdev->dev, size, &dmah->busaddr, + GFP_KERNEL | __GFP_COMP); if (dmah->vaddr == NULL) { kfree(dmah); return NULL; } - memset(dmah->vaddr, 0, size); - /* XXX - Is virt_to_page() legal for consistent mem? */ /* Reserve */ for (addr = (unsigned long)dmah->vaddr, sz = size;
Replace dma_alloc_coherent + memset with dma_zalloc_coherent. Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com> --- drivers/gpu/drm/drm_pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)