On 10/06/2007 07:42 AM, Kyle McMartin wrote: > This reverts commit f443675affe3f16dd428e46f0f7fd3f4d703eeab, which > breaks horribly if you aren't running an unreleased xf86-video-intel > driver out of git.
I guess, this will break my graphics, no? http://lkml.org/lkml/2007/9/20/447 > Conflicts: > > drivers/char/agp/intel-agp.c > > Signed-off-by: Kyle McMartin <[EMAIL PROTECTED]> > --- > > 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 a5d0e95..141ca17 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); -- Jiri Slaby ([EMAIL PROTECTED]) Faculty of Informatics, Masaryk University - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
