Patch for bug #1912 applied incorrectly to 6.8 branch

[Michel Dänzer]

On Wed, 2005-02-09 at 21:18 -0800, Alan Coopersmith wrote:
> Michel Dänzer wrote:
> > On Wed, 2005-02-09 at 20:53 -0800, Alan Coopersmith wrote:
> >>>>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  [...]
> > 
> > 
> > Same bug? This commit was supposed to be attachment #1433 for bug #1912
> 
> Sorry, I meant both of the patches listed in bugzilla for bug #1220 were
> applied, that was the "same bug" I was referring to - the first one presumably
> should have been removed when the second one went in, since they both added
> RADEONSetFBLocation calls in different places.

I'm afraid you still don't understand. This commit wasn't supposed to
have anything to do with bug #1220 (the commit description is
inconsistent and wrong too); the only valid patch for that was applied
correctly in September, as you noted.

The extraneous line in this commit wasn't part of any patch I've seen
(or I would have objected), it came out of blue air.


-- 
Earthling Michel Dänzer      |     Debian (powerpc), X and DRI developer
Libre software enthusiast    |   http://svcs.affero.net/rm.php?r=daenzer