| Message ID | 35ea0a682ee80b86e38172d4a5a7a2ad9ec7d274.1403530604.git.joe@perches.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Jun 23, 2014 at 06:41:34AM -0700, Joe Perches wrote: > Remove the now unnecessary memset too. > > Signed-off-by: Joe Perches <joe@perches.com> Since I seem to be the last idiot to have touched i810.ko: Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i810/i810_dma.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c > index e88bac1..bae897d 100644 > --- a/drivers/gpu/drm/i810/i810_dma.c > +++ b/drivers/gpu/drm/i810/i810_dma.c > @@ -393,15 +393,14 @@ static int i810_dma_initialize(struct drm_device *dev, > > /* Program Hardware Status Page */ > dev_priv->hw_status_page = > - pci_alloc_consistent(dev->pdev, PAGE_SIZE, > - &dev_priv->dma_status_page); > + pci_zalloc_consistent(dev->pdev, PAGE_SIZE, > + &dev_priv->dma_status_page); > if (!dev_priv->hw_status_page) { > dev->dev_private = (void *)dev_priv; > i810_dma_cleanup(dev); > DRM_ERROR("Can not allocate hardware status page\n"); > return -ENOMEM; > } > - memset(dev_priv->hw_status_page, 0, PAGE_SIZE); > DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page); > > I810_WRITE(0x02080, dev_priv->dma_status_page); > -- > 1.8.1.2.459.gbcd45b4.dirty > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index e88bac1..bae897d 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c @@ -393,15 +393,14 @@ static int i810_dma_initialize(struct drm_device *dev, /* Program Hardware Status Page */ dev_priv->hw_status_page = - pci_alloc_consistent(dev->pdev, PAGE_SIZE, - &dev_priv->dma_status_page); + pci_zalloc_consistent(dev->pdev, PAGE_SIZE, + &dev_priv->dma_status_page); if (!dev_priv->hw_status_page) { dev->dev_private = (void *)dev_priv; i810_dma_cleanup(dev); DRM_ERROR("Can not allocate hardware status page\n"); return -ENOMEM; } - memset(dev_priv->hw_status_page, 0, PAGE_SIZE); DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page); I810_WRITE(0x02080, dev_priv->dma_status_page);
Remove the now unnecessary memset too. Signed-off-by: Joe Perches <joe@perches.com> --- drivers/gpu/drm/i810/i810_dma.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)