diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 20:50:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 20:50:10 +1000 |
| commit | 2cd142a43559b54bb6c5c2b9dcb48ad0dadcb79c (patch) | |
| tree | 9667b4865aa02059aebf004006fce017d7f7c033 /drivers/gpu/drm/i810/i810_dma.c | |
| parent | a4545c61a6ecdcd609c7f16f0169708ee3e8a95c (diff) | |
| parent | 0a0724d0f5d276bc3ce551b062c67e897553e493 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/gpu/drm/i810/i810_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i810/i810_dma.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index e88bac1d781f..bae897de9468 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); |