From 5fb89f85cd78b714760c23d6acf4305ba484a76d Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 10 Mar 2009 12:55:54 -0700 Subject: [PATCH] --- yaml --- r: 132177 b: refs/heads/master c: 9c1e8a4ebcc04226cb6f3a1bf1d72f4cafd6b089 h: refs/heads/master i: 132175: 8c148baf9490fb4da1c9fbd0c181c924b7662447 v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/intel-agp.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6fdb05cbde6e..1ed7f9b08763 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 229cc58ba2b5a83b0b55764c6cb98695c106238a +refs/heads/master: 9c1e8a4ebcc04226cb6f3a1bf1d72f4cafd6b089 diff --git a/trunk/drivers/char/agp/intel-agp.c b/trunk/drivers/char/agp/intel-agp.c index c7714185f831..4373adb2119a 100644 --- a/trunk/drivers/char/agp/intel-agp.c +++ b/trunk/drivers/char/agp/intel-agp.c @@ -633,13 +633,15 @@ static void intel_i830_init_gtt_entries(void) 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; }