[Bug 10023] MergedFB no display on second monitor. 2.6.20, Xorg 7.1, AMD64, R423, PCIE

[bugzilla-daemon at annarchy.freedesktop.org]

http://bugs.freedesktop.org/show_bug.cgi?id=10023





------- Comment #11 from johnjaylward at yahoo.com  2007-02-20 00:09 -------
(In reply to comment #10)
> (In reply to comment #9)
> > Dave's code is in his git repo
> > (http://gitweb.freedesktop.org/?p=users/airlied/xf86-video-ati.git;a=summary)
> > on the sil164-support branch.  I've also ported it to ati git HEAD, and the
> > patch is available here:
> > http://www.botchco.com/alex/xorg/dualdvi.diff
> > 
> Wondering if I'm using the correct tool to apply the patch or not because when
> I try to apply the patch I get the following error:
> #patch -p0 <
> var/tmp/portage/x11-drivers/xf86-video-ati-6.6.3/distdir/dualdvi.diff
> 
> can't find file to patch at input line 6
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |diff --git a/Makefile.am b/Makefile.am
> |diff --git a/configure.ac b/configure.ac
> |index 16b93e1..c36c8b0 100644
> |--- a/configure.ac
> |+++ b/configure.ac
> --------------------------
> File to patch:
> 
> The error continues with each new file section of the diff.
> 

OK, should have done a little more research on my own before posting. I have
the original problem fixed by using -p1 instead of -p0, but I now get the
following:

PATCH COMMAND:   patch -p1 -g0 -E --no-backup-if-mismatch <
/var/tmp/portage/x11-drivers/xf86-video-ati-6.6.3/distdir/dualdvi.diff

========================
patching file configure.ac
Hunk #1 succeeded at 232 (offset 14 lines).
patching file src/Makefile.am
patching file src/radeon.h
Hunk #1 succeeded at 797 with fuzz 2 (offset -22 lines).
can't find file to patch at input line 43
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/src/radeon_display.c b/src/radeon_display.c
|index d661c17..381b3b2 100644
|--- a/src/radeon_display.c
|+++ b/src/radeon_display.c
--------------------------
No file to patch.  Skipping patch.
7 out of 7 hunks ignored
patching file src/radeon_driver.c
Hunk #1 succeeded at 5733 (offset 1960 lines).
Hunk #2 FAILED at 7341.
Hunk #3 succeeded at 7436 (offset 1963 lines).
Hunk #4 FAILED at 7620.
Hunk #5 FAILED at 7645.
Hunk #6 FAILED at 8283.
Hunk #7 succeeded at 8758 (offset 2275 lines).
4 out of 7 hunks FAILED -- saving rejects to file src/radeon_driver.c.rej
patching file src/radeon_probe.h
Hunk #1 succeeded at 40 (offset 1 line).
Hunk #2 FAILED at 106.
Hunk #3 FAILED at 136.
2 out of 3 hunks FAILED -- saving rejects to file src/radeon_probe.h.rej
patching file src/radeon_reg.h
Hunk #1 succeeded at 736 (offset -20 lines).
Hunk #2 succeeded at 832 (offset -20 lines).
Hunk #3 succeeded at 1236 (offset -20 lines).


-- 
Configure bugmail: http://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.