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

Commit 6585b572 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] Rework AGPv3 modesetting fallback.
  [AGPGART] Add suspend callback for i965
  [AGPGART] Fix number of aperture sizes in 830 gart structs.
  [AGPGART] Intel 965 Express support.
  [AGPGART] agp.h: constify struct agp_bridge_data::version
  [AGPGART] const'ify VIA AGP PCI table.
  [AGPGART] CONFIG_PM=n slim: drivers/char/agp/intel-agp.c
  [AGPGART] CONFIG_PM=n slim: drivers/char/agp/efficeon-agp.c
  [AGPGART] Const'ify the agpgart driver version.
  [AGPGART] remove private page protection map
parents 2ee8099f edf03fb0

drivers/char/agp/agp.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ struct agp_bridge_driver { 
};



struct agp_bridge_data {

	struct agp_version *version;

	const struct agp_version *version;

	struct agp_bridge_driver *driver;

	struct vm_operations_struct *vm_ops;

	void *previous_size;

drivers/char/agp/backend.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
 * past 0.99 at all due to some boolean logic error. */

#define AGPGART_VERSION_MAJOR 0

#define AGPGART_VERSION_MINOR 101

static struct agp_version agp_current_version =

static const struct agp_version agp_current_version =

{

	.major = AGPGART_VERSION_MAJOR,

	.minor = AGPGART_VERSION_MINOR,

drivers/char/agp/efficeon-agp.c

+9 −7
Original line number Diff line number Diff line
@@ -337,13 +337,6 @@ static struct agp_bridge_driver efficeon_driver = { 
	.agp_destroy_page	= agp_generic_destroy_page,

};





static int agp_efficeon_resume(struct pci_dev *pdev)

{

	printk(KERN_DEBUG PFX "agp_efficeon_resume()\n");

	return efficeon_configure();

}



static int __devinit agp_efficeon_probe(struct pci_dev *pdev,

				     const struct pci_device_id *ent)

{
@@ -414,11 +407,18 @@ static void __devexit agp_efficeon_remove(struct pci_dev *pdev) 
	agp_put_bridge(bridge);

}



#ifdef CONFIG_PM

static int agp_efficeon_suspend(struct pci_dev *dev, pm_message_t state)

{

	return 0;

}



static int agp_efficeon_resume(struct pci_dev *pdev)

{

	printk(KERN_DEBUG PFX "agp_efficeon_resume()\n");

	return efficeon_configure();

}

#endif



static struct pci_device_id agp_efficeon_pci_table[] = {

	{
@@ -439,8 +439,10 @@ static struct pci_driver agp_efficeon_pci_driver = { 
	.id_table	= agp_efficeon_pci_table,

	.probe		= agp_efficeon_probe,

	.remove		= agp_efficeon_remove,

#ifdef CONFIG_PM

	.suspend	= agp_efficeon_suspend,

	.resume		= agp_efficeon_resume,

#endif

};



static int __init agp_efficeon_init(void)

drivers/char/agp/frontend.c

+2 −25
Original line number Diff line number Diff line
@@ -151,35 +151,12 @@ static void agp_add_seg_to_client(struct agp_client *client, 
	client->segments = seg;

}



/* Originally taken from linux/mm/mmap.c from the array

 * protection_map.

 * The original really should be exported to modules, or

 * some routine which does the conversion for you

 */



static const pgprot_t my_protect_map[16] =

{

	__P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,

	__S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111

};



static pgprot_t agp_convert_mmap_flags(int prot)

{

#define _trans(x,bit1,bit2) \

((bit1==bit2)?(x&bit1):(x&bit1)?bit2:0)



	unsigned long prot_bits;

	pgprot_t temp;



	prot_bits = _trans(prot, PROT_READ, VM_READ) |

	    _trans(prot, PROT_WRITE, VM_WRITE) |

	    _trans(prot, PROT_EXEC, VM_EXEC);



	prot_bits |= VM_SHARED;



	temp = my_protect_map[prot_bits & 0x0000000f];



	return temp;

	prot_bits = calc_vm_prot_bits(prot) | VM_SHARED;

	return vm_get_page_prot(prot_bits);

}



static int agp_create_segment(struct agp_client *client, struct agp_region *region)

drivers/char/agp/generic.c

+24 −15
Original line number Diff line number Diff line
@@ -568,25 +568,34 @@ static void agp_v3_parse_one(u32 *requested_mode, u32 *bridge_agpstat, u32 *vga_ 
		*bridge_agpstat &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD);

		goto done;



	} else if (*requested_mode & AGPSTAT3_4X) {

		*bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);

		*bridge_agpstat |= AGPSTAT3_4X;

		goto done;



	} else {



		/*

		 * If we didn't specify AGPx8, we can only do x4.

		 * If the hardware can't do x4, we're up shit creek, and never

		 *  should have got this far.

		 * If we didn't specify an AGP mode, we see if both

		 * the graphics card, and the bridge can do x8, and use if so.

		 * If not, we fall back to x4 mode.

		 */

		if ((*bridge_agpstat & AGPSTAT3_8X) && (*vga_agpstat & AGPSTAT3_8X)) {

			printk(KERN_INFO PFX "No AGP mode specified. Setting to highest mode supported by bridge & card (x8).\n");

			*bridge_agpstat &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD);

			*vga_agpstat &= ~(AGPSTAT3_4X | AGPSTAT3_RSVD);

		} else {

			printk(KERN_INFO PFX "Fell back to AGPx4 mode because");

			if (!(*bridge_agpstat & AGPSTAT3_8X)) {

				printk("bridge couldn't do x8. bridge_agpstat:%x (orig=%x)\n", *bridge_agpstat, origbridge);

				*bridge_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);

		if ((*bridge_agpstat & AGPSTAT3_4X) && (*vga_agpstat & AGPSTAT3_4X))

				*bridge_agpstat |= AGPSTAT3_4X;

		else {

			printk(KERN_INFO PFX "Badness. Don't know which AGP mode to set. "

							"[bridge_agpstat:%x vga_agpstat:%x fell back to:- bridge_agpstat:%x vga_agpstat:%x]\n",

							origbridge, origvga, *bridge_agpstat, *vga_agpstat);

			if (!(*bridge_agpstat & AGPSTAT3_4X))

				printk(KERN_INFO PFX "Bridge couldn't do AGP x4.\n");

			if (!(*vga_agpstat & AGPSTAT3_4X))

				printk(KERN_INFO PFX "Graphic card couldn't do AGP x4.\n");

			return;

			}

			if (!(*vga_agpstat & AGPSTAT3_8X)) {

				printk("graphics card couldn't do x8. vga_agpstat:%x (orig=%x)\n", *vga_agpstat, origvga);

				*vga_agpstat &= ~(AGPSTAT3_8X | AGPSTAT3_RSVD);

				*vga_agpstat |= AGPSTAT3_4X;

			}

		}

	}