Comment 2 for bug 151351

For the record in this bug, this was my revert:
commit e1b2d424de27643a2ff2ccdca4a187b083c1b389
Author: Loic Minier <email address hidden>
Date: Wed Oct 10 20:57:55 2007 +0200

    Revert "Revert "Revert "UBUNTU: remove broken changes from intel-agp.c"""

    This reverts commit a14a5742c371dc55ca55bfc23bec892dfea26b9b.

    Causes major corruption with the xserver-xorg-video-intel fix in place.

(so a revert of revert of revert of removal :-)

In the end, what I wanted is to flip the seemingly only change related to G33 between -13 and -14, which resulted in using the current upstream code and in this diff:
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index aeaa4fa..4b7002e 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -508,6 +508,11 @@ 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);