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

Commit 9914712e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 

* 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp: remove flush_agp_mappings calls from new flush handling code
  intel-agp: introduce IS_I915 and do some cleanups..
  [intel_agp] fix name for G35 chipset
  intel-agp: fixup resource handling in flush code.
  intel-agp: add new chipset ID
  agp: remove unnecessary pci_dev_put
  agp: remove uid comparison as security check
  fix AGP warning
  agp/intel: Add chipset flushing support for i8xx chipsets.
  intel-agp: add chipset flushing support
  agp: add chipset flushing support to AGP interface
parents 488823f1 bc894606

arch/x86/pci/i386.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ pcibios_align_resource(void *data, struct resource *res, 
		}

	}

}



EXPORT_SYMBOL(pcibios_align_resource);



/*

 *  Handle resources of PCI devices.  If the world were perfect, we could

drivers/char/agp/agp.h

+5 −1
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ struct agp_bridge_driver { 
	void *(*agp_alloc_page)(struct agp_bridge_data *);

	void (*agp_destroy_page)(void *, int flags);

	int (*agp_type_to_mask_type) (struct agp_bridge_data *, int);

	void (*chipset_flush)(struct agp_bridge_data *);

};



struct agp_bridge_data {
@@ -235,6 +236,9 @@ struct agp_bridge_data { 
#define I965_PGETBL_SIZE_512KB	(0 << 1)

#define I965_PGETBL_SIZE_256KB	(1 << 1)

#define I965_PGETBL_SIZE_128KB	(2 << 1)

#define I965_PGETBL_SIZE_1MB	(3 << 1)

#define I965_PGETBL_SIZE_2MB	(4 << 1)

#define I965_PGETBL_SIZE_1_5MB	(5 << 1)

#define G33_PGETBL_SIZE_MASK    (3 << 8)

#define G33_PGETBL_SIZE_1M      (1 << 8)

#define G33_PGETBL_SIZE_2M      (2 << 8)

drivers/char/agp/amd-k7-agp.c

+0 −4
Original line number Diff line number Diff line
@@ -436,10 +436,6 @@ static int __devinit agp_amdk7_probe(struct pci_dev *pdev, 
				return -ENODEV;

			}

			cap_ptr = pci_find_capability(gfxcard, PCI_CAP_ID_AGP);

			if (!cap_ptr) {

				pci_dev_put(gfxcard);

				continue;

			}

		}



		/* With so many variants of NVidia cards, it's simpler just

drivers/char/agp/backend.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
 * fix some real stupidity. It's only by chance we can bump

 * past 0.99 at all due to some boolean logic error. */

#define AGPGART_VERSION_MAJOR 0

#define AGPGART_VERSION_MINOR 102

#define AGPGART_VERSION_MINOR 103

static const struct agp_version agp_current_version =

{

	.major = AGPGART_VERSION_MAJOR,

drivers/char/agp/compat_ioctl.c

+4 −0
Original line number Diff line number Diff line
@@ -273,6 +273,10 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case AGPIOC_UNBIND32:

		ret_val = compat_agpioc_unbind_wrap(curr_priv, (void __user *) arg);

		break;



	case AGPIOC_CHIPSET_FLUSH32:

		ret_val = agpioc_chipset_flush_wrap(curr_priv);

		break;

	}



ioctl_out: