Patch for bug #1912 applied incorrectly to 6.8 branch

[Alan Coopersmith]

Adam Jackson wrote:
> On Wednesday 09 February 2005 02:39, Michel Dänzer wrote:
> 
>>It looks like instead of the second hunk of
>>
>>https://bugs.freedesktop.org/attachment.cgi?id=1433
>>
>>a RADEONSetFBLocation() call was added to RADEONAdjustFrame().
>>RADEONSetFBLocation() should be called as rarely as possible because it
>>messes with the guts of the GPU memory controller.

According to CVSweb, the RADEONSetFBLocation in RADEONAdjustFrame() came
from this patch, which was checked into 6.8.2 in Decemeber (rev 1.19.2.7):
   * xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
   Bugzilla #1220 (https://bugs.freedesktop.org/show_bug.cgi?id=1220)
   attachment #980 (https://bugs.freedesktop.org/attachment.cgi?id=980):
   Fix garbage screen on radeon cards which may appear after a system
   suspend/resume cycle.
   Patch by Matthias Hopf <mhopf at suse.de>

It appears a previous patch adding RADEONSetFBLocation to fix this same
bug was also added previously in Septemeber to the 6.8.x branch before the
6.8.2 procedures were in place.   It seems only that previous patch made it
into the HEAD branch, and the newer one didn't.

 > I think we need to get this backed out before the release, please.

Isn't the release supposed to be done now?

-- 
	-Alan Coopersmith-           alan.coopersmith at sun.com
	 Sun Microsystems, Inc. - X Window System Engineering