Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e9abdd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart 

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
  [AGPGART] x86_64: Enable VIA AGP driver on x86-64 for VIA P4 chipsets
  [AGPGART] x86_64: Fix wrong PCI ID for ALI M1695 AGP bridge
  [AGPGART] ATI RS350 support.
  [AGPGART] Lots of CodingStyle/whitespace cleanups.
parents c36cd16f 9d1f6b28

drivers/char/agp/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ config AGP_SWORKS 


config AGP_VIA

	tristate "VIA chipset support"

	depends on AGP && X86_32

	depends on AGP

	help

	  This option gives you AGP support for the GLX component of

	  X on VIA MVP3/Apollo Pro chipsets.

drivers/char/agp/agp.h

+5 −6
Original line number Diff line number Diff line
@@ -104,8 +104,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 *, unsigned long, int);

	void (*cache_flush)(void);

	int (*create_gatt_table)(struct agp_bridge_data *);

	int (*free_gatt_table)(struct agp_bridge_data *);

drivers/char/agp/alpha-agp.c

+8 −6
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ static struct page *alpha_core_agp_vm_nopage(struct vm_area_struct *vma, 
	dma_addr = address - vma->vm_start + agp->aperture.bus_base;

	pa = agp->ops->translate(agp, dma_addr);



	if (pa == (unsigned long)-EINVAL) return NULL;	/* no translation */

	if (pa == (unsigned long)-EINVAL)

		return NULL;	/* no translation */



	/*

	 * Get the page, inc the use count, and return it
@@ -98,7 +99,8 @@ static int alpha_core_agp_insert_memory(struct agp_memory *mem, off_t pg_start, 


	temp = agp_bridge->current_size;

	num_entries = A_SIZE_FIX(temp)->num_entries;

	if ((pg_start + mem->page_count) > num_entries) return -EINVAL;

	if ((pg_start + mem->page_count) > num_entries)

		return -EINVAL;



	status = agp->ops->bind(agp, pg_start, mem);

	mb();

drivers/char/agp/ati-agp.c

+7 −3
Original line number Diff line number Diff line
@@ -466,6 +466,10 @@ static struct agp_device_ids ati_agp_device_ids[] __devinitdata = 
		.device_id	= PCI_DEVICE_ID_ATI_RS300_200,

		.chipset_name	= "IGP9100/M",

	},

	{

		.device_id	= PCI_DEVICE_ID_ATI_RS350_200,

		.chipset_name	= "IGP9100/M",

	},

	{ }, /* dummy final entry, always present */

};

drivers/char/agp/intel-agp.c

+19 −26
Original line number Diff line number Diff line
@@ -201,9 +201,9 @@ static int intel_i810_insert_entries(struct agp_memory *mem, off_t pg_start, 
	temp = agp_bridge->current_size;

	num_entries = A_SIZE_FIX(temp)->num_entries;



	if ((pg_start + mem->page_count) > num_entries) {

	if ((pg_start + mem->page_count) > num_entries)

		return -EINVAL;

	}



	for (j = pg_start; j < (pg_start + mem->page_count); j++) {

		if (!PGE_EMPTY(agp_bridge, readl(agp_bridge->gatt_table+j)))

			return -EBUSY;
@@ -1603,11 +1603,10 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, 
		name = "i820";

		break;

	case PCI_DEVICE_ID_INTEL_82830_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82830_CGC)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82830_CGC))

			bridge->driver = &intel_830_driver;

		} else {

		else

			bridge->driver = &intel_830mp_driver;

		}

		name = "830M";

		break;

	case PCI_DEVICE_ID_INTEL_82840_HB:
@@ -1619,11 +1618,10 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, 
		name = "i845";

		break;

	case PCI_DEVICE_ID_INTEL_82845G_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82845G_IG)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82845G_IG))

			bridge->driver = &intel_830_driver;

		} else {

		else

			bridge->driver = &intel_845_driver;

		}

		name = "845G";

		break;

	case PCI_DEVICE_ID_INTEL_82850_HB:
@@ -1648,11 +1646,10 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, 
		name = "i860";

		break;

	case PCI_DEVICE_ID_INTEL_82865_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82865_IG)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82865_IG))

			bridge->driver = &intel_830_driver;

		} else {

		else

			bridge->driver = &intel_845_driver;

		}

		name = "865";

		break;

	case PCI_DEVICE_ID_INTEL_82875_HB:
@@ -1660,35 +1657,31 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, 
		name = "i875";

		break;

	case PCI_DEVICE_ID_INTEL_82915G_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82915G_IG)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82915G_IG))

			bridge->driver = &intel_915_driver;

		} else {

		else

			bridge->driver = &intel_845_driver;

		}

		name = "915G";

		break;

	case PCI_DEVICE_ID_INTEL_82915GM_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82915GM_IG)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82915GM_IG))

			bridge->driver = &intel_915_driver;

		} else {

		else

			bridge->driver = &intel_845_driver;

		}

		name = "915GM";

		break;

	case PCI_DEVICE_ID_INTEL_82945G_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82945G_IG)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82945G_IG))

			bridge->driver = &intel_915_driver;

		} else {

		else

			bridge->driver = &intel_845_driver;

		}

		name = "945G";

		break;

	case PCI_DEVICE_ID_INTEL_82945GM_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82945GM_IG)) {

		if (find_i830(PCI_DEVICE_ID_INTEL_82945GM_IG))

			bridge->driver = &intel_915_driver;

		} else {

		else

			bridge->driver = &intel_845_driver;

		}

		name = "945GM";

		break;

	case PCI_DEVICE_ID_INTEL_7505_0: