Attachment 36269 Details for Bug 28430 – PATCH: Don't oops with zero stolen memory

[patch] PATCH: Don't oops with zero stolen memory

intel-gtt-nomem.patch (text/plain), 1.28 KB, created by Ondrej Zary on 2010-06-14 10:19:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ondrej Zary

Created: 2010-06-14 10:19:55 UTC

Size: 1.28 KB

patch

obsolete

>diff -urp linux-2.6.35-rc2-orig/drivers/char/agp/intel-gtt.c linux-2.6.35-rc2/drivers/char/agp/intel-gtt.c
>--- linux-2.6.35-rc2-orig/drivers/char/agp/intel-gtt.c	2010-06-06 05:43:24.000000000 +0200
>+++ linux-2.6.35-rc2/drivers/char/agp/intel-gtt.c	2010-06-14 19:14:05.000000000 +0200
>@@ -797,6 +797,10 @@ static int intel_i830_create_gatt_table(
> 
> 	/* we have to call this as early as possible after the MMIO base address is known */
> 	intel_i830_init_gtt_entries();
>+	if (intel_private.gtt_entries == 0) {
>+		iounmap(intel_private.registers);
>+		return -ENOMEM;
>+	}
> 
> 	agp_bridge->gatt_table = NULL;
> 
>@@ -1279,6 +1283,11 @@ static int intel_i915_create_gatt_table(
> 
> 	/* we have to call this as early as possible after the MMIO base address is known */
> 	intel_i830_init_gtt_entries();
>+	if (intel_private.gtt_entries == 0) {
>+		iounmap(intel_private.gtt);
>+		iounmap(intel_private.registers);
>+		return -ENOMEM;
>+	}
> 
> 	agp_bridge->gatt_table = NULL;
> 
>@@ -1387,6 +1396,11 @@ static int intel_i965_create_gatt_table(
> 
> 	/* we have to call this as early as possible after the MMIO base address is known */
> 	intel_i830_init_gtt_entries();
>+	if (intel_private.gtt_entries == 0) {
>+		iounmap(intel_private.gtt);
>+		iounmap(intel_private.registers);
>+		return -ENOMEM;
>+	}
> 
> 	agp_bridge->gatt_table = NULL;
>

Actions: View | Splinter Review

Attachments on bug 28430: 36115 | 36269

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.