diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2007-10-06 01:42:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-06 12:49:43 -0700 |
| commit | 3a4986955c0d9806e96a9d738ef7c40cb0cdaba3 (patch) | |
| tree | 3f637fa3280ab0a91b1bb8e0bb8cc7f4b435ef00 /drivers | |
| parent | 71e4eda8ce698178ee448ff82bdc5803c77a736d (diff) | |
| download | linux-stable-3a4986955c0d9806e96a9d738ef7c40cb0cdaba3.tar.gz linux-stable-3a4986955c0d9806e96a9d738ef7c40cb0cdaba3.tar.bz2 linux-stable-3a4986955c0d9806e96a9d738ef7c40cb0cdaba3.zip | |
Revert "intel_agp: fix stolen mem range on G33"
This reverts commit f443675affe3f16dd428e46f0f7fd3f4d703eeab, which
breaks horribly if you aren't running an unreleased xf86-video-intel
driver out of git.
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Cc: Dave Airlie <airlied@linux.ie>
Cc: Zhenyu Wang <zhenyu.z.wang@intel.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/agp/intel-agp.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index a5d0e95a227a..141ca176c397 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c @@ -506,11 +506,6 @@ static void intel_i830_init_gtt_entries(void) break; } } else { - /* G33's GTT stolen memory is separate from gfx data - * stolen memory. - */ - if (IS_G33) - size = 0; switch (gmch_ctrl & I855_GMCH_GMS_MASK) { case I855_GMCH_GMS_STOLEN_1M: gtt_entries = MB(1) - KB(size); |