Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

drm/ati_pcigart: use memset_io to reset the memory

Browse source 
Also don't setup pci_gart if we aren't going to need it.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2009-02-26 10:13:47 +10:00
parent 87f0da5535
commit 6abf66018f
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/gpu/drm/ati_pcigart.c
View file

@ -99,7 +99,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
struct drm_sg_mem *entry = dev->sg; struct drm_sg_mem *entry = dev->sg;
void *address = NULL; void *address = NULL;
unsigned long pages; unsigned long pages;
u32 *pci_gart, page_base, gart_idx; u32 *pci_gart = NULL, page_base, gart_idx;
dma_addr_t bus_address = 0; dma_addr_t bus_address = 0;
int i, j, ret = 0; int i, j, ret = 0;
int max_ati_pages, max_real_pages; int max_ati_pages, max_real_pages;
@ -118,6 +118,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
goto done; goto done;
} }
pci_gart = gart_info->table_handle->vaddr;
address = gart_info->table_handle->vaddr; address = gart_info->table_handle->vaddr;
bus_address = gart_info->table_handle->busaddr; bus_address = gart_info->table_handle->busaddr;
} else { } else {
@ -128,7 +129,6 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
(unsigned long)address); (unsigned long)address);
} }
pci_gart = (u32 *) address;
max_ati_pages = (gart_info->table_size / sizeof(u32)); max_ati_pages = (gart_info->table_size / sizeof(u32));
max_real_pages = max_ati_pages / (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); max_real_pages = max_ati_pages / (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE);
@ -138,8 +138,7 @@ 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) { if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {
memset(pci_gart, 0, max_ati_pages * sizeof(u32)); memset(pci_gart, 0, max_ati_pages * sizeof(u32));
} else { } else {
for (gart_idx = 0; gart_idx < max_ati_pages; gart_idx++) memset_io((void __iomem *)map->handle, 0, max_ati_pages * sizeof(u32));
DRM_WRITE32(map, gart_idx * sizeof(u32), 0);
} }
gart_idx = 0; gart_idx = 0;