diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-07 13:36:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-07 13:36:00 +1000 |
| commit | 90520b78a4f8ba1faef75961eddd8192077e0ac2 (patch) | |
| tree | 4179071189852a622d4a9e615a004388474069b5 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | d94a5108f716bbd524358eb5a440d63991744a62 (diff) | |
| parent | e89a8c901ca94a47c0e0b2fb335623d810e37545 (diff) | |
Merge branch 'drm-core-next' into drm-linus
* drm-core-next:
drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()
drm/edid: Fix CVT width/height decode
drm/edid: Skip empty CVT codepoints
drm: remove address mask param for drm_pci_alloc()
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 701bfeac7f5..02607ed6139 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -123,7 +123,7 @@ static int i915_init_phys_hws(struct drm_device *dev) drm_i915_private_t *dev_priv = dev->dev_private; /* Program Hardware Status Page */ dev_priv->status_page_dmah = - drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff); + drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE); if (!dev_priv->status_page_dmah) { DRM_ERROR("Can not allocate hardware status page\n"); |