Skip to content

Commit

Permalink
agp/intel: Remove the artificial cap on stolen size
Browse files Browse the repository at this point in the history
Now that the stolen memory does not also steal entries from the GTT, we
can use all the memory the BIOS set aside for the GPU.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  • Loading branch information
Chris Wilson committed Nov 23, 2010
1 parent fe669bf commit 1b6064d
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions drivers/char/agp/intel-gtt.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@
#define USE_PCI_DMA_API 0
#endif

/* Max amount of stolen space, anything above will be returned to Linux */
int intel_max_stolen = 32 * 1024 * 1024;

static const struct aper_size_info_fixed intel_i810_sizes[] =
{
{64, 16384, 4},
Expand Down Expand Up @@ -486,7 +483,7 @@ static unsigned int intel_gtt_stolen_entries(void)
u8 rdct;
int local = 0;
static const int ddt[4] = { 0, 16, 32, 64 };
unsigned int overhead_entries, stolen_entries;
unsigned int overhead_entries;
unsigned int stolen_size = 0;

pci_read_config_word(intel_private.bridge_dev,
Expand Down Expand Up @@ -625,12 +622,7 @@ static unsigned int intel_gtt_stolen_entries(void)
}
}

if (!local && stolen_size > intel_max_stolen) {
dev_info(&intel_private.bridge_dev->dev,
"detected %dK stolen memory, trimming to %dK\n",
stolen_size / KB(1), intel_max_stolen / KB(1));
stolen_size = intel_max_stolen;
} else if (stolen_size > 0) {
if (stolen_size > 0) {
dev_info(&intel_private.bridge_dev->dev, "detected %dK %s memory\n",
stolen_size / KB(1), local ? "local" : "stolen");
} else {
Expand All @@ -639,9 +631,7 @@ static unsigned int intel_gtt_stolen_entries(void)
stolen_size = 0;
}

stolen_entries = stolen_size/KB(4) - overhead_entries;

return stolen_entries;
return stolen_size/KB(4) - overhead_entries;
}

static void i965_adjust_pgetbl_size(unsigned int size_flag)
Expand Down

0 comments on commit 1b6064d

Please sign in to comment.