Bug 2698 - Extra RADEONSetFBLocation() in 6.8.2 due to patch merge error
Summary: Extra RADEONSetFBLocation() in 6.8.2 due to patch merge error
Status: RESOLVED FIXED
Alias: None
Product: xorg
Classification: Unclassified
Component: Driver/Radeon (show other bugs)
Version: 6.8.2
Hardware: All All
: high normal
Assignee: Xorg Project Team
QA Contact: Xorg Project Team
URL: http://lists.freedesktop.org/archives...
Whiteboard:
Keywords:
Depends on:
Blocks: 7247
  Show dependency treegraph
 
Reported: 2005-03-10 17:09 UTC by Alan Coopersmith
Modified: 2011-10-15 15:33 UTC (History)
3 users (show)

See Also:
i915 platform:
i915 features:


Attachments
Patch to xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c (277 bytes, patch)
2005-03-10 17:17 UTC, Alan Coopersmith
alan.coopersmith: 6.8-branch?
Details | Splinter Review

Description Alan Coopersmith 2005-03-10 17:09:28 UTC
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 [details] [review] (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@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
Comment 1 Alan Coopersmith 2005-03-10 17:17:05 UTC
Created attachment 2079 [details] [review]
Patch to xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
Comment 2 Mike A. Harris 2005-04-14 23:57:38 UTC
https://bugs.freedesktop.org/show_bug.cgi?id=2556 seems that it might
be a duplicate.
Comment 3 Jim Cornette 2005-04-15 04:07:40 UTC
If the bug caused the computer to lockup when changing resolutions or switching
from the GUI to a terminal and then back, this patch applies to bug 2556 also. I
do not get the lockup with xorg-x11-6.8.2-22 that was recently released.
Comment 4 Adam Jackson 2005-10-21 11:58:35 UTC
this needs to be resolved before 7.0.
Comment 5 Michel Dänzer 2005-10-24 01:21:31 UTC
(In reply to comment #4)
> this needs to be resolved before 7.0.

It was only ever a problem on the 6.8 branch.
Comment 6 Michel Dänzer 2005-10-31 02:42:37 UTC
This bug was only on the 6.8 branch, so it doesn't block 6.9/7.0.
Comment 7 Daniel Stone 2007-02-27 01:25:42 UTC
Sorry about the phenomenal bug spam, guys.  Adding xorg-team@ to the QA contact so bugs don't get lost in future.


Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.