Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patching the latest 3.12.0 nouveau fails with latest shinpei0208/gdev #20

Open
steve555 opened this issue Dec 1, 2013 · 0 comments
Open

Comments

@steve555
Copy link

steve555 commented Dec 1, 2013

Hi there,
I'm currently using the OS Fedora 20 64-bit with the latest drm,nouveau-kernel, mesa, and the xf86-video-nouveau DDX source code, from the git repositories.

I am interested with using CUDA-5.5 with the nouveau driver. I have downloaded another
nouveau-kernel inside another folder,so I can safely patch it with your patches.

Anyway, I have downloaded latest envytools and the latest gdev. I have tried the 2005 gdev,but I'm getting the same problem with that.

The Graphics Card I'm running currently is a Nvidia Geforce 560 with 1Gb of memory
(A NVCE card).

I have read the README.gdev and the other REDAME'S also.
I have tried patching my latest copy of the nouveau-kernel, but with no success.
FWIW, I was patching the kernel last night and I do know gdev-nouveau-3.3.patch did apply cleanly, but for some unknown reason, it now does not, or any of the other patches in the folder. The errors I am hitting are here:

[steve@localhost linux-2.6-gdev]$ patch -p1 --dry-run < /home/steve/gdev/mod/linux/patches/gdev-nouveau-3.10.patch
checking file drivers/gpu/drm/nouveau/Makefile
Hunk #1 succeeded at 306 with fuzz 2 (offset 70 lines).
checking file drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
Hunk #1 succeeded at 676 with fuzz 1 (offset 253 lines).
Hunk #2 succeeded at 699 (offset 253 lines).
checking file drivers/gpu/drm/nouveau/gdev_interface.c
checking file drivers/gpu/drm/nouveau/gdev_interface.h
checking file drivers/gpu/drm/nouveau/nouveau_chan.c
checking file drivers/gpu/drm/nouveau/nouveau_dma.h
checking file drivers/gpu/drm/nouveau/nouveau_drm.c
Hunk #1 succeeded at 88 with fuzz 2 (offset 17 lines).
Hunk #2 succeeded at 365 (offset 10 lines).
Hunk #3 FAILED at 382.
Hunk #4 succeeded at 658 with fuzz 1 (offset 51 lines).
Hunk #5 FAILED at 764.
2 out of 5 hunks FAILED
[steve@localhost linux-2.6-gdev]$ patch -p1 --dry-run < /home/steve/gdev/mod/linux/patches/gdev-nouveau-3.9.patch
checking file drivers/gpu/drm/nouveau/Makefile
Hunk #1 succeeded at 306 with fuzz 2 (offset 70 lines).
checking file drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
Hunk #1 succeeded at 676 with fuzz 1 (offset 267 lines).
Hunk #2 succeeded at 699 (offset 267 lines).
checking file drivers/gpu/drm/nouveau/gdev_interface.c
checking file drivers/gpu/drm/nouveau/gdev_interface.h
checking file drivers/gpu/drm/nouveau/nouveau_chan.c
checking file drivers/gpu/drm/nouveau/nouveau_dma.h
checking file drivers/gpu/drm/nouveau/nouveau_drm.c
Hunk #1 succeeded at 88 with fuzz 2 (offset 17 lines).
Hunk #2 succeeded at 365 (offset 10 lines).
Hunk #3 FAILED at 386.
Hunk #4 succeeded at 658 with fuzz 1 (offset 58 lines).
Hunk #5 FAILED at 763.
2 out of 5 hunks FAILED
[steve@localhost linux-2.6-gdev]$ patch -p1 --dry-run < /home/steve/gdev/mod/linux/patches/gdev-nouveau-3.8.patch
checking file drivers/gpu/drm/nouveau/Makefile
Hunk #1 succeeded at 306 with fuzz 2 (offset 92 lines).
checking file drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
Hunk #1 succeeded at 676 with fuzz 1 (offset 267 lines).
Hunk #2 succeeded at 699 (offset 267 lines).
checking file drivers/gpu/drm/nouveau/gdev_interface.c
checking file drivers/gpu/drm/nouveau/gdev_interface.h
checking file drivers/gpu/drm/nouveau/nouveau_chan.c
Hunk #1 succeeded at 370 (offset 1 line).
checking file drivers/gpu/drm/nouveau/nouveau_dma.h
checking file drivers/gpu/drm/nouveau/nouveau_drm.c
Hunk #1 succeeded at 79 (offset 11 lines).
Hunk #2 succeeded at 365 (offset 49 lines).
Hunk #3 FAILED at 347.
Hunk #4 succeeded at 658 with fuzz 1 (offset 98 lines).
Hunk #5 FAILED at 713.
2 out of 5 hunks FAILED
[steve@localhost linux-2.6-gdev]$ patch -p1 --dry-run < /home/steve/gdev/mod/linux/patches/gdev-nouveau-3.7.patch
checking file drivers/gpu/drm/nouveau/Makefile
Hunk #1 succeeded at 306 with fuzz 2 (offset 122 lines).
checking file drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
Hunk #1 succeeded at 676 with fuzz 1 (offset 267 lines).
Hunk #2 succeeded at 699 (offset 267 lines).
checking file drivers/gpu/drm/nouveau/gdev_interface.c
checking file drivers/gpu/drm/nouveau/gdev_interface.h
checking file drivers/gpu/drm/nouveau/nouveau_chan.c
Hunk #1 succeeded at 370 (offset 3 lines).
checking file drivers/gpu/drm/nouveau/nouveau_dma.h
checking file drivers/gpu/drm/nouveau/nouveau_drm.c
Hunk #1 succeeded at 79 (offset 9 lines).
Hunk #2 succeeded at 365 (offset 53 lines).
Hunk #3 FAILED at 343.
Hunk #4 succeeded at 658 with fuzz 1 (offset 135 lines).
Hunk #5 FAILED at 668.
2 out of 5 hunks FAILED
[steve@localhost linux-2.6-gdev]$ patch -p1 --dry-run < /home/steve/gdev/mod/linux/patches/gdev-nouveau-3.6.patch
checking file drivers/gpu/drm/nouveau/Makefile
Hunk #1 FAILED at 3.
1 out of 1 hunk FAILED
checking file drivers/gpu/drm/nouveau/gdev_interface.c
checking file drivers/gpu/drm/nouveau/gdev_interface.h
can't find file to patch at input line 575
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
|*** a/drivers/gpu/drm/nouveau/nouveau_channel.c 2012-10-01 08:47:46.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nouveau_channel.c 2013-07-16 15:17:43.105682830 +0900

File to patch:
Skip this patch? [y] y
Skipping patch.
1 out of 1 hunk ignored
checking file drivers/gpu/drm/nouveau/nouveau_dma.h
can't find file to patch at input line 612
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
|*** a/drivers/gpu/drm/nouveau/nouveau_drv.c 2012-10-01 08:47:46.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nouveau_drv.c 2013-07-16 15:17:43.106682772 +0900

File to patch: patch: tty read failed: Bad file descriptor
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 659
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
|*** a/drivers/gpu/drm/nouveau/nouveau_state.c 2012-10-01 08:47:46.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nouveau_state.c 2013-07-16 15:17:43.107682718 +0900

File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 694
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c
|*** a/drivers/gpu/drm/nouveau/nvc0_graph.c 2012-10-01 08:47:46.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nvc0_graph.c 2013-07-16 15:17:43.108682666 +0900

File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
[steve@localhost linux-2.6-gdev]$ patch -p1 --dry-run < /home/steve/gdev/mod/linux/patches/gdev-nouveau-3.5.patch
checking file drivers/gpu/drm/nouveau/Makefile
Hunk #1 FAILED at 3.
1 out of 1 hunk FAILED
checking file drivers/gpu/drm/nouveau/gdev_interface.c
checking file drivers/gpu/drm/nouveau/gdev_interface.h
can't find file to patch at input line 574
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
|*** a/drivers/gpu/drm/nouveau/nouveau_channel.c 2012-07-22 05:58:29.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nouveau_channel.c 2013-07-16 13:55:54.091799828 +0900

File to patch:
Skip this patch? [y] y
Skipping patch.
1 out of 1 hunk ignored
checking file drivers/gpu/drm/nouveau/nouveau_dma.h
can't find file to patch at input line 611
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
|*** a/drivers/gpu/drm/nouveau/nouveau_drv.c 2012-07-22 05:58:29.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nouveau_drv.c 2013-07-16 13:55:54.093799949 +0900

File to patch: patch: tty read failed: Bad file descriptor
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 655
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
|*** a/drivers/gpu/drm/nouveau/nouveau_state.c 2012-07-22 05:58:29.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nouveau_state.c 2013-07-16 13:55:54.095800061 +0900

File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 689
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c
|*** a/drivers/gpu/drm/nouveau/nvc0_graph.c 2012-07-22 05:58:29.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nvc0_graph.c 2013-07-16 13:55:54.096800113 +0900

File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
[steve@localhost linux-2.6-gdev]$ patch -p1 --dry-run < /home/steve/gdev/mod/linux/patches/gdev-nouveau-3.4.patch
checking file drivers/gpu/drm/nouveau/Makefile
Hunk #1 FAILED at 3.
1 out of 1 hunk FAILED
checking file drivers/gpu/drm/nouveau/gdev_interface.c
checking file drivers/gpu/drm/nouveau/gdev_interface.h
can't find file to patch at input line 574
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
|*** a/drivers/gpu/drm/nouveau/nouveau_drv.c 2012-05-21 07:29:13.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nouveau_drv.c 2013-07-11 18:55:09.180310715 +0900

File to patch:
Skip this patch? [y] y
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 618
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
|*** a/drivers/gpu/drm/nouveau/nouveau_state.c 2012-05-21 07:29:13.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nouveau_state.c 2013-07-11 18:55:09.185310851 +0900

File to patch: patch: tty read failed: Bad file descriptor
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 645
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c
|*** a/drivers/gpu/drm/nouveau/nvc0_graph.c 2012-05-21 07:29:13.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nvc0_graph.c 2013-07-11 18:55:09.194311022 +0900

File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
[steve@localhost linux-2.6-gdev]$ patch -p1 --dry-run < /home/steve/gdev/mod/linux/patches/gdev-nouveau-3.3.patch
checking file drivers/gpu/drm/nouveau/Makefile
Hunk #1 FAILED at 3.
1 out of 1 hunk FAILED
checking file drivers/gpu/drm/nouveau/gdev_interface.c
checking file drivers/gpu/drm/nouveau/gdev_interface.h
can't find file to patch at input line 574
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
|*** a/drivers/gpu/drm/nouveau/nouveau_drv.c 2012-03-19 08:15:34.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nouveau_drv.c 2013-07-11 17:18:03.200173623 +0900

File to patch:
Skip this patch? [y] y
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 618
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
|*** a/drivers/gpu/drm/nouveau/nouveau_state.c 2012-03-19 08:15:34.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nouveau_state.c 2013-07-11 17:18:03.202173151 +0900

File to patch: patch: tty read failed: Bad file descriptor
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 645
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c
|*** a/drivers/gpu/drm/nouveau/nvc0_graph.c 2012-03-19 08:15:34.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nvc0_graph.c 2013-07-11 17:18:03.203172917 +0900

File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
[steve@localhost linux-2.6-gdev]$ patch -p1 --dry-run </home/steve/gdev/mod/linux/patches/gdev-nouveau-3.3.patch
checking file drivers/gpu/drm/nouveau/Makefile
Hunk #1 FAILED at 3.
1 out of 1 hunk FAILED
checking file drivers/gpu/drm/nouveau/gdev_interface.c
checking file drivers/gpu/drm/nouveau/gdev_interface.h
can't find file to patch at input line 574
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
|*** a/drivers/gpu/drm/nouveau/nouveau_drv.c 2012-03-19 08:15:34.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nouveau_drv.c 2013-07-11 17:18:03.200173623 +0900

File to patch:
Skip this patch? [y] y
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 618
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
|*** a/drivers/gpu/drm/nouveau/nouveau_state.c 2012-03-19 08:15:34.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nouveau_state.c 2013-07-11 17:18:03.202173151 +0900

File to patch: patch: tty read failed: Bad file descriptor
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 645
Perhaps you used the wrong -p or --strip option?

The text leading up to this was:

|diff -crN a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c
|*** a/drivers/gpu/drm/nouveau/nvc0_graph.c 2012-03-19 08:15:34.000000000 +0900

|--- b/drivers/gpu/drm/nouveau/nvc0_graph.c 2013-07-11 17:18:03.203172917 +0900

File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored

I hope you can help me with this issue and tell me if it is possible to use nouveau with gdev/CUDA.

Regards,
Steve555

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant