ati_pcigart: fill out 40-bit gart table support properly

Thanks to Alex for supplying this info.
This commit is contained in:
Dave Airlie 2008-05-14 22:35:32 +10:00
parent caace3692f
commit dd1f33f83c

View file

@ -34,6 +34,8 @@
#include "drmP.h" #include "drmP.h"
# define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */ # define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */
# define ATI_PCIGART_PAGE_MASK (~(ATI_PCIGART_PAGE_SIZE-1))
static int drm_ati_alloc_pcigart_table(struct drm_device *dev, static int drm_ati_alloc_pcigart_table(struct drm_device *dev,
struct drm_ati_pcigart_info *gart_info) struct drm_ati_pcigart_info *gart_info)
{ {
@ -148,18 +150,23 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
bus_address = 0; bus_address = 0;
goto done; goto done;
} }
page_base = (u32) entry->busaddr[i];
for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) { for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) {
switch(gart_info->gart_reg_if) { switch(gart_info->gart_reg_if) {
case DRM_ATI_GART_IGP: case DRM_ATI_GART_IGP:
page_base = (u32) entry->busaddr[i] & ATI_PCIGART_PAGE_MASK;
page_base |= (upper_32_bits(entry->busaddr[i]) & 0xff) << 4;
*pci_gart = cpu_to_le32((page_base) | 0xc); *pci_gart = cpu_to_le32((page_base) | 0xc);
break; break;
case DRM_ATI_GART_PCIE: case DRM_ATI_GART_PCIE:
page_base = (u32)(entry->busaddr[i] & ATI_PCIGART_PAGE_MASK);
page_base >>= 8;
page_base |= (upper_32_bits(entry->busaddr[i]) & 0xff) << 24;
*pci_gart = cpu_to_le32((page_base >> 8) | 0xc); *pci_gart = cpu_to_le32((page_base >> 8) | 0xc);
break; break;
default: default:
case DRM_ATI_GART_PCI: case DRM_ATI_GART_PCI:
page_base = (u32) entry->busaddr[i];
*pci_gart = cpu_to_le32(page_base); *pci_gart = cpu_to_le32(page_base);
break; break;
} }