The patch titled
intel-agp: fix a panic with 1M of shared memory, no GTT entries
has been removed from the -mm tree. Its filename was
intel-agp-fix-a-panic-with-1m-of-shared-memory-no-gtt-entries.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: intel-agp: fix a panic with 1M of shared memory, no GTT entries
From: Lubomir Rintel <lkundrak@xxxxx>
When GTT size is equal to amount of video memory, the amount of GTT
entries is computed lower than zero, which is invalid and leads to
off-by-one error in intel_i915_configure()
Originally posted here:
http://bugzilla.kernel.org/show_bug.cgi?id=12539
http://bugzilla.redhat.com/show_bug.cgi?id=445592
Signed-off-by: Lubomir Rintel <lkundrak@xxxxx>
Cc: Lubomir Rintel <lkundrak@xxxxx>
Cc: Dave Airlie <airlied@xxxxxxxx>
Reviewed-by: Eric Anholt <eric@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/agp/intel-agp.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff -puN drivers/char/agp/intel-agp.c~intel-agp-fix-a-panic-with-1m-of-shared-memory-no-gtt-entries drivers/char/agp/intel-agp.c
--- a/drivers/char/agp/intel-agp.c~intel-agp-fix-a-panic-with-1m-of-shared-memory-no-gtt-entries
+++ a/drivers/char/agp/intel-agp.c
@@ -633,13 +633,15 @@ static void intel_i830_init_gtt_entries(
break;
}
}
- if (gtt_entries > 0)
+ if (gtt_entries > 0) {
dev_info(&agp_bridge->dev->dev, "detected %dK %s memory\n",
gtt_entries / KB(1), local ? "local" : "stolen");
- else
+ gtt_entries /= KB(4);
+ } else {
dev_info(&agp_bridge->dev->dev,
"no pre-allocated video memory detected\n");
- gtt_entries /= KB(4);
+ gtt_entries = 0;
+ }
intel_private.gtt_entries = gtt_entries;
}
_
Patches currently in -mm which might be from lkundrak@xxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
