agp: switch AGP to use page array instead of unsigned long array
Subsystems (4)
Dave Airlie
maintainerPATCH 1/1 agp: switch AGP to use page array instead of unsigned long array
From: Dave Airlie <[email protected]>
This switches AGP to use an array of pages for tracking the pages allocated to the GART. This should enable GEM on PAE to work a lot better as we can pass highmem pages to the PAT code and it will do the right thing with them.
cc'ed people who cared about AGP in the past.
Signed-off-by Dave Airlie <[email protected]>
Cc Jan Beulich <[email protected]>
Cc Pallipadi, Venkatesh <[email protected]>
Cc Eric Anholt <[email protected]>
Cc Thomas Hellstrom <[email protected]>
--- drivers/char/agp/agp.h | 12 +++--- drivers/char/agp/ali-agp.c | 26 +++++++------- drivers/char/agp/amd-k7-agp.c | 2 +- drivers/char/agp/amd64-agp.c | 2 +- drivers/char/agp/ati-agp.c | 5 ++- drivers/char/agp/backend.c | 8 ++-- drivers/char/agp/efficeon-agp.c | 5 ++- drivers/char/agp/generic.c | 69 +++++++++++++++---------------------- drivers/char/agp/hp-agp.c | 9 ++--- drivers/char/agp/i460-agp.c | 43 ++++++++++++++--------- drivers/char/agp/intel-agp.c | 49 ++++++++++++-------------- drivers/char/agp/nvidia-agp.c | 2 +- drivers/char/agp/parisc-agp.c | 20 +++++++++-- drivers/char/agp/sgi-agp.c | 5 ++- drivers/char/agp/sworks-agp.c | 2 +- drivers/char/agp/uninorth-agp.c | 12 +++--- drivers/gpu/drm/drm_agpsupport.c | 2 +- drivers/gpu/drm/drm_memory.c | 8 ++-- drivers/gpu/drm/drm_vm.c | 4 +- include/linux/agp_backend.h | 2 +- 20 files changed, 147 insertions(+), 140 deletions(-)
drivers/char/agp/agp.h +6 -6
@@ -107,7 +107,7 @@ struct agp_bridge_driver {void (*agp_enable)(struct agp_bridge_data *,u32 );void (*cleanup)(void );void (*tlb_flush)(struct agp_memory *); -unsigned long (*mask_memory)(struct agp_bridge_data *,unsigned long ,int ); +unsigned long (*mask_memory)(struct agp_bridge_data *,struct page *,int );void (*cache_flush)(void );int (*create_gatt_table)(struct agp_bridge_data *);int (*free_gatt_table)(struct agp_bridge_data *);
@@ -115,9 +115,9 @@ struct agp_bridge_driver {int (*remove_memory)(struct agp_memory *,off_t ,int );struct agp_memory *(*alloc_by_type) (size_t ,int );void (*free_by_type)(struct agp_memory *); -void *(*agp_alloc_page)(struct agp_bridge_data *); +struct page *(*agp_alloc_page)(struct agp_bridge_data *);int (*agp_alloc_pages)(struct agp_bridge_data *,struct agp_memory *,size_t ); -void (*agp_destroy_page)(void *,int flags); +void (*agp_destroy_page)(struct page *,int flags);void (*agp_destroy_pages)(struct agp_memory *);int (*agp_type_to_mask_type) (struct agp_bridge_data *,int );void (*chipset_flush)(struct agp_bridge_data *);
@@ -278,10 +278,10 @@ int agp_generic_insert_memory(struct agp_memory *mem, off_t pg_start, int type);int agp_generic_remove_memory (struct agp_memory *mem,off_t pg_start,int type);struct agp_memory *agp_generic_alloc_by_type (size_t page_count,int type);void agp_generic_free_by_type (struct agp_memory *curr); -void *agp_generic_alloc_page (struct agp_bridge_data *bridge); +struct page *agp_generic_alloc_page (struct agp_bridge_data *bridge);int agp_generic_alloc_pages (struct agp_bridge_data *agp_bridge,struct agp_memory *memory,size_t page_count); -void agp_generic_destroy_page (void *addr,int flags); +void agp_generic_destroy_page (struct page *page,int flags);void agp_generic_destroy_pages (struct agp_memory *memory);void agp_free_key (int key);int agp_num_entries (void );
@@ -291,7 +291,7 @@ int agp_3_5_enable(struct agp_bridge_data *bridge);void global_cache_flush (void );void get_agp_version (struct agp_bridge_data *bridge);unsigned long agp_generic_mask_memory (struct agp_bridge_data *bridge, -unsigned long addr,int type); +struct page *page,int type);int agp_generic_type_to_mask_type (struct agp_bridge_data *bridge,int type);struct agp_bridge_data *agp_generic_find_bridge (struct pci_dev *pdev);
drivers/char/agp/ali-agp.c +13 -13
@@ -141,37 +141,37 @@ static void m1541_cache_flush(void) } } -static void *m1541_alloc_page (struct agp_bridge_data *bridge) +static struct page *m1541_alloc_page (struct agp_bridge_data *bridge) { -void *addr =agp_generic_alloc_page (agp_bridge); +struct page *page =agp_generic_alloc_page (agp_bridge);u32 temp; -if (!addr) +if (!page)return NULL ;pci_read_config_dword (agp_bridge->dev,ALI_CACHE_FLUSH_CTRL , &temp);pci_write_config_dword (agp_bridge->dev,ALI_CACHE_FLUSH_CTRL , (((temp &ALI_CACHE_FLUSH_ADDR_MASK ) | -virt_to_gart (addr)) |ALI_CACHE_FLUSH_EN )); -return addr; +phys_to_gart (page_to_phys (page))) |ALI_CACHE_FLUSH_EN )); +return page; } -static void ali_destroy_page (void * addr,int flags) +static void ali_destroy_page (struct page *page,int flags) { -if (addr) { +if (page) {if (flags &AGP_PAGE_DESTROY_UNMAP ) {global_cache_flush ();/* is this really needed? --hch */ -agp_generic_destroy_page (addr, flags); +agp_generic_destroy_page (page, flags); }else -agp_generic_destroy_page (addr, flags); +agp_generic_destroy_page (page, flags); } } -static void m1541_destroy_page (void * addr,int flags) +static void m1541_destroy_page (struct page *page,int flags) {u32 temp; -if (addr ==NULL ) +if (page ==NULL )return ;if (flags &AGP_PAGE_DESTROY_UNMAP ) {
@@ -180,9 +180,9 @@ static void m1541_destroy_page(void * addr, int flags)pci_read_config_dword (agp_bridge->dev,ALI_CACHE_FLUSH_CTRL , &temp);pci_write_config_dword (agp_bridge->dev,ALI_CACHE_FLUSH_CTRL , (((temp &ALI_CACHE_FLUSH_ADDR_MASK ) | -virt_to_gart (addr)) |ALI_CACHE_FLUSH_EN )); +phys_to_gart (page_to_phys (page))) |ALI_CACHE_FLUSH_EN )); } -agp_generic_destroy_page (addr, flags); +agp_generic_destroy_page (page, flags); }
drivers/char/agp/amd-k7-agp.c +1 -1
@@ -325,7 +325,7 @@ static int amd_insert_memory(struct agp_memory *mem, off_t pg_start, int type) addr = (j *PAGE_SIZE ) + agp_bridge->gart_bus_addr; cur_gatt =GET_GATT (addr);writel (agp_generic_mask_memory (agp_bridge, - mem->memory[i], mem->type), cur_gatt+GET_GATT_OFF (addr)); + mem->pages[i], mem->type), cur_gatt+GET_GATT_OFF (addr));readl (cur_gatt+GET_GATT_OFF (addr));/* PCI Posting. */ }amd_irongate_tlbflush (mem);
drivers/char/agp/amd64-agp.c +1 -1
@@ -79,7 +79,7 @@ static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type)for (i =0 , j = pg_start; i < mem->page_count; i++, j++) { tmp = agp_bridge->driver->mask_memory (agp_bridge, - mem->memory[i], mask_type); + mem->pages[i], mask_type);BUG_ON (tmp &0xffffff0000000ffcULL ); pte = (tmp &0x000000ff00000000ULL ) >>28 ;
drivers/char/agp/ati-agp.c +3 -2
@@ -296,8 +296,9 @@ static int ati_insert_memory(struct agp_memory * mem,for (i =0 , j = pg_start; i < mem->page_count; i++, j++) { addr = (j *PAGE_SIZE ) + agp_bridge->gart_bus_addr; cur_gatt =GET_GATT (addr); -writel (agp_bridge->driver->mask_memory (agp_bridge, - mem->memory[i], mem->type), cur_gatt+GET_GATT_OFF (addr)); +writel (agp_bridge->driver->mask_memory (agp_bridge, + mem->pages[i], mem->type), + cur_gatt+GET_GATT_OFF (addr));readl (cur_gatt+GET_GATT_OFF (addr));/* PCI Posting. */ } agp_bridge->driver->tlb_flush (mem);
drivers/char/agp/backend.c +4 -4
@@ -141,17 +141,17 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) bridge->version = &agp_current_version;if (bridge->driver->needs_scratch_page) { -void *addr = bridge->driver->agp_alloc_page (bridge); +struct page *page = bridge->driver->agp_alloc_page (bridge); -if (!addr) { +if (!page) {dev_err (&bridge->dev->dev,"can't get memory for scratch page\n" );return -ENOMEM ; } - bridge->scratch_page_real =virt_to_gart (addr); + bridge->scratch_page_real =phys_to_gart (page_to_phys (page)); bridge->scratch_page = - bridge->driver->mask_memory (bridge, bridge->scratch_page_real,0 ); + bridge->driver->mask_memory (bridge, page,0 ); } size_value = bridge->driver->fetch_size ();
drivers/char/agp/efficeon-agp.c +3 -2
@@ -65,8 +65,9 @@ static const struct gatt_mask efficeon_generic_masks[] = };/* This function does the same thing as mask_memory() for this chipset... */ -static inline unsigned long efficeon_mask_memory (unsigned long addr) +static inline unsigned long efficeon_mask_memory (struct page *page) { +unsigned long addr =phys_to_gart (page_to_phys (page));return addr |0x00000001 ; }
@@ -257,7 +258,7 @@ static int efficeon_insert_memory(struct agp_memory * mem, off_t pg_start, int t last_page =NULL ;for (i =0 ; i < count; i++) {int index = pg_start + i; -unsigned long insert =efficeon_mask_memory (mem->memory[i]); +unsigned long insert =efficeon_mask_memory (mem->pages[i]); page = (unsigned int *) efficeon_private.l1_table[index >>10 ];
drivers/char/agp/generic.c +28 -41
193 lines not on this page · raw message
drivers/char/agp/hp-agp.c +4 -5
@@ -361,13 +361,11 @@ hp_zx1_insert_memory (struct agp_memory *mem, off_t pg_start, int type)for (i =0 , j = io_pg_start; i < mem->page_count; i++) {unsigned long paddr; - paddr = mem->memory[i]; + paddr =page_to_phys (mem->pages[i]);for (k =0 ; k < hp->io_pages_per_kpage; k++, j++, paddr += hp->io_page_size) { - hp->gatt[j] = - agp_bridge->driver->mask_memory (agp_bridge, - paddr, type); + hp->gatt[j] =HP_ZX1_PDIR_VALID_BIT | paddr; } }
@@ -397,8 +395,9 @@ hp_zx1_remove_memory (struct agp_memory *mem, off_t pg_start, int type)static unsigned long hp_zx1_mask_memory (struct agp_bridge_data *bridge, -unsigned long addr,int type) +struct page *page,int type) { +unsigned long addr =phys_to_gart (page_to_phys (page));return HP_ZX1_PDIR_VALID_BIT | addr; }
drivers/char/agp/i460-agp.c +26 -17
130 lines not on this page · raw message
drivers/char/agp/intel-agp.c +23 -26
134 lines not on this page · raw message
drivers/char/agp/nvidia-agp.c +1 -1
@@ -225,7 +225,7 @@ static int nvidia_insert_memory(struct agp_memory *mem, off_t pg_start, int type }for (i =0 , j = pg_start; i < mem->page_count; i++, j++) {writel (agp_bridge->driver->mask_memory (agp_bridge, - mem->memory[i], mask_type), + mem->pages[i], mask_type), agp_bridge->gatt_table+nvidia_private.pg_offset+j); }
drivers/char/agp/parisc-agp.c +16 -4
@@ -31,6 +31,10 @@#define AGP8X_MODE_BIT 3#define AGP8X_MODE (1 << AGP8X_MODE_BIT) +static unsigned long +parisc_agp_mask_memory (struct agp_bridge_data *bridge,unsigned long addr, +int type); + static struct _parisc_agp_info { void __iomem *ioc_regs; void __iomem *lba_regs;
@@ -149,12 +153,12 @@ parisc_agp_insert_memory(struct agp_memory *mem, off_t pg_start, int type)for (i =0 , j = io_pg_start; i < mem->page_count; i++) {unsigned long paddr; - paddr = mem->memory[i]; + paddr =page_to_phys (mem->pages[i]);for (k =0 ; k < info->io_pages_per_kpage; k++, j++, paddr += info->io_page_size) { info->gatt[j] = - agp_bridge->driver->mask_memory (agp_bridge, +parisc_agp_mask_memory (agp_bridge, paddr, type); } }
@@ -185,9 +189,17 @@ parisc_agp_remove_memory(struct agp_memory *mem, off_t pg_start, int type) }static unsigned long -parisc_agp_mask_memory (struct agp_bridge_data *bridge, -unsigned long addr,int type) +parisc_agp_mask_memory (struct agp_bridge_data *bridge,unsigned long addr, +int type) +{ +return SBA_PDIR_VALID_BIT | addr; +} + +static unsigned long +parisc_agp_page_mask_memory (struct agp_bridge_data *bridge,struct page *page, +int type) { +unsigned long addr =phys_to_gart (page_to_phys (page));return SBA_PDIR_VALID_BIT | addr; }
drivers/char/agp/sgi-agp.c +3 -2
@@ -71,8 +71,9 @@ static void sgi_tioca_tlbflush(struct agp_memory *mem)*/ static unsigned long sgi_tioca_mask_memory (struct agp_bridge_data *bridge, -unsigned long addr,int type) +struct page *page,int type) { +unsigned long addr =phys_to_gart (page_to_phys (page));return tioca_physpage_to_gart (addr); }
@@ -189,7 +190,7 @@ static int sgi_tioca_insert_memory(struct agp_memory *mem, off_t pg_start,for (i =0 , j = pg_start; i < mem->page_count; i++, j++) { table[j] = - bridge->driver->mask_memory (bridge, mem->memory[i], + bridge->driver->mask_memory (bridge, mem->pages[i], mem->type); }
drivers/char/agp/sworks-agp.c +1 -1
@@ -349,7 +349,7 @@ static int serverworks_insert_memory(struct agp_memory *mem,for (i =0 , j = pg_start; i < mem->page_count; i++, j++) { addr = (j *PAGE_SIZE ) + agp_bridge->gart_bus_addr; cur_gatt =SVRWRKS_GET_GATT (addr); -writel (agp_bridge->driver->mask_memory (agp_bridge, mem->memory[i], mem->type), cur_gatt+GET_GATT_OFF (addr)); +writel (agp_bridge->driver->mask_memory (agp_bridge, mem->pages[i], mem->type), cur_gatt+GET_GATT_OFF (addr)); }serverworks_tlbflush (mem);return 0 ;
drivers/char/agp/uninorth-agp.c +6 -6
@@ -166,9 +166,9 @@ static int uninorth_insert_memory(struct agp_memory *mem, off_t pg_start,for (i =0 , j = pg_start; i < mem->page_count; i++, j++) { agp_bridge->gatt_table[j] = -cpu_to_le32 ((mem->memory[i] &0xFFFFF000UL ) |0x1UL ); -flush_dcache_range ((unsigned long )__va (mem->memory[i]), - (unsigned long )__va (mem->memory[i])+0x1000 ); +cpu_to_le32 ((page_to_phys (mem->pages[i]) &0xFFFFF000UL ) |0x1UL ); +flush_dcache_range ((unsigned long )__va (page_to_phys (mem->pages[i])), + (unsigned long )__va (page_to_phys (mem->pages[i]))+0x1000 ); } (void )in_le32 ((volatile u32 *)&agp_bridge->gatt_table[pg_start]);mb ();
@@ -205,9 +205,9 @@ static int u3_insert_memory(struct agp_memory *mem, off_t pg_start, int type) }for (i =0 ; i < mem->page_count; i++) { - gp[i] = (mem->memory[i] >>PAGE_SHIFT ) |0x80000000UL ; -flush_dcache_range ((unsigned long )__va (mem->memory[i]), - (unsigned long )__va (mem->memory[i])+0x1000 ); + gp[i] = (page_to_phys (mem->pages[i]) >>PAGE_SHIFT ) |0x80000000UL ; +flush_dcache_range ((unsigned long )__va (page_to_phys (mem->pages[i])), + (unsigned long )__va (page_to_phys (mem->pages[i]))+0x1000 ); }mb ();flush_dcache_range ((unsigned long )gp, (unsigned long ) &gp[i]);
drivers/gpu/drm/drm_agpsupport.c +1 -1
@@ -482,7 +482,7 @@ drm_agp_bind_pages(struct drm_device *dev, }for (i =0 ; i < num_pages; i++) - mem->memory[i] =phys_to_gart (page_to_phys (pages[i])); + mem->pages[i] = pages[i]; mem->page_count = num_pages; mem->is_flushed = true;
drivers/gpu/drm/drm_memory.c +4 -4
@@ -82,10 +82,11 @@ void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area)static void *agp_remap (unsigned long offset,unsigned long size,struct drm_device * dev) { -unsigned long *phys_addr_map, i, num_pages = +unsigned long i, num_pages =PAGE_ALIGN (size) /PAGE_SIZE ;struct drm_agp_mem *agpmem;struct page **page_map; +struct page **phys_page_map;void *addr; size =PAGE_ALIGN (size);
@@ -112,10 +113,9 @@ static void *agp_remap(unsigned long offset, unsigned long size,if (!page_map)return NULL ; - phys_addr_map = - agpmem->memory->memory + (offset - agpmem->bound) /PAGE_SIZE ; + phys_page_map = (agpmem->memory->pages + (offset - agpmem->bound) /PAGE_SIZE );for (i =0 ; i < num_pages; ++i) - page_map[i] =pfn_to_page (phys_addr_map[i] >>PAGE_SHIFT ); + page_map[i] = phys_page_map[i]; addr =vmap (page_map, num_pages,VM_IOREMAP ,PAGE_AGP );vfree (page_map);
drivers/gpu/drm/drm_vm.c +2 -2
@@ -144,14 +144,14 @@ static int drm_do_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)* Get the page, inc the use count, and return it */ offset = (baddr - agpmem->bound) >>PAGE_SHIFT ; - page =virt_to_page (__va (agpmem->memory->memory[offset])); + page = agpmem->memory->pages[offset];get_page (page); vmf->page = page;DRM_DEBUG ("baddr = 0x%llx page = 0x%p, offset = 0x%llx, count=%d\n" , (unsigned long long )baddr, -__va (agpmem->memory->memory[offset]), + agpmem->memory->pages[offset], (unsigned long long )offset,page_count (page));return 0 ;
include/linux/agp_backend.h +1 -1
@@ -70,7 +70,7 @@ struct agp_memory {struct agp_memory *next;struct agp_memory *prev;struct agp_bridge_data *bridge; -unsigned long *memory; +struct page **pages;size_t page_count;int key;int num_scratch_pages;
Signature · 1 line
1.5.4.1