Merge of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart (eba4f669) · Commits · 戴 / test

drivers/char/agp/agp.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -278,6 +278,8 @@ void agp3_generic_cleanup(void);
		#define AGP_GENERIC_SIZES_ENTRIES 11
		extern struct aper_size_info_16 agp3_generic_sizes[];

		#define virt_to_gart(x) (phys_to_gart(virt_to_phys(x)))
		#define gart_to_virt(x) (phys_to_virt(gart_to_phys(x)))

		extern int agp_off;
		extern int agp_try_unsupported_boot;

+2 −2

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ static void m1541_alloc_page(struct agp_bridge_data bridge)
		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_phys(addr)) \| ALI_CACHE_FLUSH_EN ));
		virt_to_gart(addr)) \| ALI_CACHE_FLUSH_EN ));
		return addr;
		}

		@@ -174,7 +174,7 @@ static void m1541_destroy_page(void * addr)
		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_phys(addr)) \| ALI_CACHE_FLUSH_EN));
		virt_to_gart(addr)) \| ALI_CACHE_FLUSH_EN));
		agp_generic_destroy_page(addr);
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ static int amd_create_page_map(struct amd_page_map *page_map)

		SetPageReserved(virt_to_page(page_map->real));
		global_cache_flush();
		page_map->remapped = ioremap_nocache(virt_to_phys(page_map->real),
		page_map->remapped = ioremap_nocache(virt_to_gart(page_map->real),
		PAGE_SIZE);
		if (page_map->remapped == NULL) {
		ClearPageReserved(virt_to_page(page_map->real));
		@@ -154,7 +154,7 @@ static int amd_create_gatt_table(struct agp_bridge_data *bridge)

		agp_bridge->gatt_table_real = (u32 *)page_dir.real;
		agp_bridge->gatt_table = (u32 __iomem *)page_dir.remapped;
		agp_bridge->gatt_bus_addr = virt_to_phys(page_dir.real);
		agp_bridge->gatt_bus_addr = virt_to_gart(page_dir.real);

		/* Get the address for the gart region.
		* This is a bus address even on the alpha, b/c its
		@@ -167,7 +167,7 @@ static int amd_create_gatt_table(struct agp_bridge_data *bridge)

		/* Calculate the agp offset */
		for (i = 0; i < value->num_entries / 1024; i++, addr += 0x00400000) {
		writel(virt_to_phys(amd_irongate_private.gatt_pages[i]->real) \| 1,
		writel(virt_to_gart(amd_irongate_private.gatt_pages[i]->real) \| 1,
		page_dir.remapped+GET_PAGE_DIR_OFF(addr));
		readl(page_dir.remapped+GET_PAGE_DIR_OFF(addr)); /* PCI Posting. */
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -219,7 +219,7 @@ static struct aper_size_info_32 amd_8151_sizes[7] =

		static int amd_8151_configure(void)
		{
		unsigned long gatt_bus = virt_to_phys(agp_bridge->gatt_table_real);
		unsigned long gatt_bus = virt_to_gart(agp_bridge->gatt_table_real);

		/* Configure AGP regs in each x86-64 host bridge. */
		for_each_nb() {
		@@ -591,7 +591,7 @@ static void __devexit agp_amd64_remove(struct pci_dev *pdev)
		{
		struct agp_bridge_data *bridge = pci_get_drvdata(pdev);

		release_mem_region(virt_to_phys(bridge->gatt_table_real),
		release_mem_region(virt_to_gart(bridge->gatt_table_real),
		amd64_aperture_sizes[bridge->aperture_size_idx].size);
		agp_remove_bridge(bridge);
		agp_put_bridge(bridge);

+3 −3

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ static int ati_create_page_map(ati_page_map *page_map)

		SetPageReserved(virt_to_page(page_map->real));
		err = map_page_into_agp(virt_to_page(page_map->real));
		page_map->remapped = ioremap_nocache(virt_to_phys(page_map->real),
		page_map->remapped = ioremap_nocache(virt_to_gart(page_map->real),
		PAGE_SIZE);
		if (page_map->remapped == NULL \|\| err) {
		ClearPageReserved(virt_to_page(page_map->real));
		@@ -343,7 +343,7 @@ static int ati_create_gatt_table(struct agp_bridge_data *bridge)

		agp_bridge->gatt_table_real = (u32 *)page_dir.real;
		agp_bridge->gatt_table = (u32 __iomem *) page_dir.remapped;
		agp_bridge->gatt_bus_addr = virt_to_bus(page_dir.real);
		agp_bridge->gatt_bus_addr = virt_to_gart(page_dir.real);

		/* Write out the size register */
		current_size = A_SIZE_LVL2(agp_bridge->current_size);
		@@ -373,7 +373,7 @@ static int ati_create_gatt_table(struct agp_bridge_data *bridge)

		/* Calculate the agp offset */
		for(i = 0; i < value->num_entries / 1024; i++, addr += 0x00400000) {
		writel(virt_to_bus(ati_generic_private.gatt_pages[i]->real) \| 1,
		writel(virt_to_gart(ati_generic_private.gatt_pages[i]->real) \| 1,
		page_dir.remapped+GET_PAGE_DIR_OFF(addr));
		readl(page_dir.remapped+GET_PAGE_DIR_OFF(addr)); /* PCI Posting. */
		}