Attachment 299082 Details for Bug 438919 – backport of upstream agpgart cantiga id patch

[patch] backport of upstream agpgart cantiga id patch

agpgart-cantiga-v1.patch (text/plain), 4.04 KB, created by Geoff Gustafson on 2008-03-25 23:02:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Geoff Gustafson

Created: 2008-03-25 23:02:15 UTC

Size: 4.04 KB

patch

obsolete

>Index: linux-2.6.18.x86_64/drivers/char/agp/agp.h
>===================================================================
>--- linux-2.6.18.x86_64.orig/drivers/char/agp/agp.h	2008-03-25 16:37:08.000000000 -0400
>+++ linux-2.6.18.x86_64/drivers/char/agp/agp.h	2008-03-25 17:45:17.000000000 -0400
>@@ -229,6 +229,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)
>Index: linux-2.6.18.x86_64/drivers/char/agp/intel-agp.c
>===================================================================
>--- linux-2.6.18.x86_64.orig/drivers/char/agp/intel-agp.c	2008-03-25 16:37:12.000000000 -0400
>+++ linux-2.6.18.x86_64/drivers/char/agp/intel-agp.c	2008-03-25 17:55:53.000000000 -0400
>@@ -30,13 +30,16 @@
> #define PCI_DEVICE_ID_INTEL_Q35_IG          0x29B2
> #define PCI_DEVICE_ID_INTEL_Q33_HB          0x29D0
> #define PCI_DEVICE_ID_INTEL_Q33_IG          0x29D2
>+#define PCI_DEVICE_ID_INTEL_IGD_HB          0x2A40
>+#define PCI_DEVICE_ID_INTEL_IGD_IG          0x2A42
> 
> #define IS_I965 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82946GZ_HB || \
>                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_1_HB || \
>                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965Q_HB || \
>                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965G_HB || \
>                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GM_HB || \
>-                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GME_HB)
>+		 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82965GME_HB || \
>+		 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGD_HB)
> 
> #define IS_G33	(agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G33_HB || \
>                  agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q35_HB || \
>@@ -430,6 +433,15 @@ static void intel_i830_init_gtt_entries(
> 		case I965_PGETBL_SIZE_512KB:
> 			size = 512;
> 			break;
>+		case I965_PGETBL_SIZE_1MB:
>+			size = 1024;
>+			break;
>+		case I965_PGETBL_SIZE_2MB:
>+			size = 2048;
>+			break;
>+		case I965_PGETBL_SIZE_1_5MB:
>+			size = 1024 + 512;
>+			break;
> 		default:
> 			printk(KERN_INFO PFX "Unknown page table size 0x%x, "
> 				"assuming 512KB\n", (pgetbl_ctl & I965_PGETBL_SIZE_MASK));
>@@ -925,6 +937,7 @@ static int intel_i965_create_gatt_table(
>        struct aper_size_info_fixed *size;
>        int num_entries;
>        u32 temp;
>+       int gtt_offset, gtt_size;
> 
>        size = agp_bridge->current_size;
>        page_order = size->page_order;
>@@ -934,13 +947,18 @@ static int intel_i965_create_gatt_table(
>        pci_read_config_dword(intel_i830_private.i830_dev, I915_MMADDR, &temp);
> 
>        temp &= 0xfff00000;
>-       intel_i830_private.gtt = ioremap((temp + (512 * 1024)) , 512 * 1024);
>+
>+       if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGD_HB)
>+	       gtt_offset = gtt_size = MB(2);
>+       else
>+	       gtt_offset = gtt_size = KB(512);
>+
>+       intel_i830_private.gtt = ioremap((temp + gtt_offset) , gtt_size);
> 
>        if (!intel_i830_private.gtt)
>                return -ENOMEM;
> 
>-
>-       intel_i830_private.registers = ioremap(temp,128 * 4096);
>+       intel_i830_private.registers = ioremap(temp, 128 * 4096);
>        if (!intel_i830_private.registers)
>                return -ENOMEM;
> 
>@@ -1974,6 +1992,13 @@ static int __devinit agp_intel_probe(str
> 		} else
> 			bridge->driver = NULL;
> 		break;
>+	case PCI_DEVICE_ID_INTEL_IGD_HB:
>+		if (find_i830(PCI_DEVICE_ID_INTEL_IGD_IG)) {
>+			bridge->driver = &intel_i965_driver;
>+			name = "Intel Integrated Graphics Device";
>+		} else
>+			bridge->driver = NULL;
>+		break;
> 
> 	case PCI_DEVICE_ID_INTEL_7505_0:
> 		bridge->driver = &intel_7505_driver;
>@@ -2148,6 +2173,7 @@ static struct pci_device_id agp_intel_pc
> 	ID(PCI_DEVICE_ID_INTEL_G33_HB),
> 	ID(PCI_DEVICE_ID_INTEL_Q35_HB),
> 	ID(PCI_DEVICE_ID_INTEL_Q33_HB),
>+	ID(PCI_DEVICE_ID_INTEL_IGD_HB),
> 	{ }
> };
>

Actions: View | Diff

Attachments on bug 438919: 299082 | 299436