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

Commit d0de98fa authored by Alan Hourihane's avatar Alan Hourihane Committed by Dave Jones
Browse files

[PATCH] i945G patch for agpgart 



Attached is a small patch for i945G support against 2.6.11.11.

From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 3f5948fa

drivers/char/agp/intel-agp.c

+13 −2
Original line number Diff line number Diff line
@@ -418,7 +418,8 @@ static void intel_i830_init_gtt_entries(void) 
		case I915_GMCH_GMS_STOLEN_48M:

			/* Check it's really I915G */

			if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||

			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB)

			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB ||

			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB)

				gtt_entries = MB(48) - KB(size);

			else

				gtt_entries = 0;
@@ -426,7 +427,8 @@ static void intel_i830_init_gtt_entries(void) 
		case I915_GMCH_GMS_STOLEN_64M:

			/* Check it's really I915G */

			if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||

			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB)

			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB ||

			    agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB)

				gtt_entries = MB(64) - KB(size);

			else

				gtt_entries = 0;
@@ -1662,6 +1664,14 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, 
		}

		name = "915GM";

		break;

	case PCI_DEVICE_ID_INTEL_82945G_HB:

		if (find_i830(PCI_DEVICE_ID_INTEL_82945G_IG)) {

			bridge->driver = &intel_915_driver;

		} else {

			bridge->driver = &intel_845_driver;

		}

		name = "945G";

		break;

	case PCI_DEVICE_ID_INTEL_7505_0:

		bridge->driver = &intel_7505_driver;

		name = "E7505";
@@ -1801,6 +1811,7 @@ static struct pci_device_id agp_intel_pci_table[] = { 
	ID(PCI_DEVICE_ID_INTEL_7205_0),

	ID(PCI_DEVICE_ID_INTEL_82915G_HB),

	ID(PCI_DEVICE_ID_INTEL_82915GM_HB),

	ID(PCI_DEVICE_ID_INTEL_82945G_HB),

	{ }

};

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -2382,6 +2382,8 @@ 
#define PCI_DEVICE_ID_INTEL_82915G_IG	0x2582

#define PCI_DEVICE_ID_INTEL_82915GM_HB	0x2590

#define PCI_DEVICE_ID_INTEL_82915GM_IG	0x2592

#define PCI_DEVICE_ID_INTEL_82945G_HB	0x2770

#define PCI_DEVICE_ID_INTEL_82945G_IG	0x2772

#define PCI_DEVICE_ID_INTEL_ICH6_0	0x2640

#define PCI_DEVICE_ID_INTEL_ICH6_1	0x2641

#define PCI_DEVICE_ID_INTEL_ICH6_2	0x2642