[Bug 2698] New: Extra RADEONSetFBLocation() in 6.8.2 due to patch merge error

[bugzilla-daemon at freedesktop.org]

Please do not reply to this email: if you want to comment on the bug, go to    
       
the URL shown below and enter yourcomments there.     
   
https://bugs.freedesktop.org/show_bug.cgi?id=2698          
     
           Summary: Extra RADEONSetFBLocation() in 6.8.2 due to patch merge
                    error
           Product: xorg
           Version: 6.8.2
          Platform: All
               URL: http://lists.freedesktop.org/archives/xorg/2005-
                    February/006126.html
        OS/Version: All
            Status: NEW
          Severity: normal
          Priority: P2
         Component: Driver/ATI Rage128
        AssignedTo: xorg-bugzilla-noise at freedesktop.org
        ReportedBy: alan.coopersmith at sun.com
                CC: michel at daenzer.net


The patch applied during Xorg 6.8.2 developement with this changelog entry:
   * xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
   Bugzilla #1912 (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>

was later found to be an incorrectly merged version of bug #1912/patch #1433 
and bug #1220/patch #980, and introduced an additional call to
RADEONSetFBLocation() in RADEONAdjustFrame(), where it should not have been.
This extra call should be removed for the 6.8.3 release. (Since it was a patch
merge error on the 6.8.x branch, it didn't get into HEAD and doesn't affect
that branch.)

For full gory details, see the thread "Patch for bug #1912 applied incorrectly
to 6.8 branch" on
http://lists.freedesktop.org/archives/xorg/2005-February/thread.html          
     
     
--           
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email         
     
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.