Attachment 311943 Details for Bug 455579 – Backported patch from 2.6.26

[patch] Backported patch from 2.6.26

x86_64_gart.diff (text/plain), 1.68 KB, created by Matthew Garrett on 2008-07-16 11:50:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Garrett

Created: 2008-07-16 11:50:13 UTC

Size: 1.68 KB

patch

obsolete

>diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c
>index 565ee9b..3a78cc3 100644
>--- a/arch/x86_64/kernel/pci-gart.c
>+++ b/arch/x86_64/kernel/pci-gart.c
>@@ -22,6 +22,7 @@
> #include <linux/topology.h>
> #include <linux/interrupt.h>
> #include <linux/bitops.h>
>+#include <linux/sysdev.h>
> #include <asm/atomic.h>
> #include <asm/io.h>
> #include <asm/mtrr.h>
>@@ -486,6 +487,27 @@ static __init unsigned read_aperture(struct pci_dev *dev, u32 *size)
> 	return aper_base;
> } 
> 
>+static int gart_resume(struct sys_device *dev)
>+{
>+	return 0;
>+}
>+
>+static int gart_suspend(struct sys_device *dev, pm_message_t state)
>+{
>+	return -EINVAL;
>+}
>+
>+static struct sysdev_class gart_sysdev_class = {
>+	.name = "gart",
>+	.suspend = gart_suspend,
>+	.resume = gart_resume,
>+};
>+
>+static struct sys_device device_gart = {
>+	.id     = 0,
>+	.cls    = &gart_sysdev_class,
>+};
>+
> /* 
>  * Private Northbridge GATT initialization in case we cannot use the
>  * AGP driver for some reason.  
>@@ -496,7 +518,7 @@ static __init int init_k8_gatt(struct agp_kern_info *info)
> 	void *gatt;
> 	unsigned aper_base, new_aper_base;
> 	unsigned aper_size, gatt_size, new_aper_size;
>-	int i;
>+	int i, error;
> 
> 	printk(KERN_INFO "PCI-DMA: Disabling AGP.\n");
> 	aper_size = aper_base = info->aper_size = 0;
>@@ -545,6 +567,13 @@ static __init int init_k8_gatt(struct agp_kern_info *info)
> 
> 		pci_write_config_dword(dev, 0x90, ctl); 
> 	}
>+
>+	error = sysdev_class_register(&gart_sysdev_class);
>+	if (!error)
>+		error = sysdev_register(&device_gart);
>+	if (error)
>+		panic("Could not register gart_sysdev -- would corrupt data on next suspend");
>+	
> 	flush_gart();
> 	
> 	printk("PCI-DMA: aperture base @ %x size %u KB\n",aper_base, aper_size>>10);

Actions: View | Diff

Attachments on bug 455579: 311943