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/ati_pcigart.c | |
| parent | d94a5108f716bbd524358eb5a440d63991744a62 (diff) | |
| parent | e89a8c901ca94a47c0e0b2fb335623d810e37545 (diff) | |
| download | blackbird-op-linux-90520b78a4f8ba1faef75961eddd8192077e0ac2.tar.gz blackbird-op-linux-90520b78a4f8ba1faef75961eddd8192077e0ac2.zip | |
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/ati_pcigart.c')
| -rw-r--r-- | drivers/gpu/drm/ati_pcigart.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c index 628eae3e9b83..a1fce68e3bbe 100644 --- a/drivers/gpu/drm/ati_pcigart.c +++ b/drivers/gpu/drm/ati_pcigart.c @@ -39,8 +39,7 @@ static int drm_ati_alloc_pcigart_table(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info) { gart_info->table_handle = drm_pci_alloc(dev, gart_info->table_size, - PAGE_SIZE, - gart_info->table_mask); + PAGE_SIZE); if (gart_info->table_handle == NULL) return -ENOMEM; @@ -112,6 +111,13 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) { DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n"); + if (pci_set_dma_mask(dev->pdev, gart_info->table_mask)) { + DRM_ERROR("fail to set dma mask to 0x%Lx\n", + gart_info->table_mask); + ret = 1; + goto done; + } + ret = drm_ati_alloc_pcigart_table(dev, gart_info); if (ret) { DRM_ERROR("cannot allocate PCI GART page!\n"); |
