| View previous topic :: View next topic |
| Author |
Message |
Xe
Apprentice
Joined: 02 Sep 2004
Posts: 254
Location: Karlsruhe, Germany
|
 Posted: Sun Feb 20, 2005 3:18 pm Post subject: nvidia-kernel: Problem mit Patch für mm-sources! |
 |
|
Hi!
Ich möchte einen mm-kernel (2.6.10-mm2) mit nvidia-kernel verwenden. Allerdings funktioniert der patch nicht...
Die Version der Treiber, die ich mergen will, ist 1.0.6629-r3. In dem ebuild habe ich folgendes in die src_unpack - Funktion zu den Patches für kernel 2.6 eingefügt:
| Code: |
epatch ${FILESDIR}/${PV}/n.patch
/usr/bin/patch -p3 < ${FILESDIR}/${PV}/n.patch
|
die Datei n.patch in files seiht wie folgt aus:
| Code: |
--- /usr/src/nv/os-agp.c.6629 2005-01-09 15:28:42.000000000 -0500
+++ /usr/src/nv/os-agp.c 2005-01-09 15:30:00.000000000 -0500
@@ -82,7 +82,7 @@
* the memory controller.
*/
- if (drm_agp_p->acquire())
+ if (drm_agp_p->acquire(agp_bridge))
{
nv_printf(NV_DBG_ERRORS, "NVRM: AGPGART: backend in use\n");
inter_module_put("drm_agp");
@@ -110,7 +110,7 @@
*/
drm_agp_p->copy_info(&agpinfo);
#else
- if (drm_agp_p->copy_info(&agpinfo)) {
+ if (drm_agp_p->copy_info(agp_bridge, &agpinfo)) {
nv_printf(NV_DBG_ERRORS,
"NVRM: AGPGART: kernel reports chipset as unsupported\n");
goto failed;
@@ -170,7 +170,7 @@
if (!(agp_rate & 0x00000004)) agpinfo.mode &= ~0x00000004;
if (!(agp_rate & 0x00000002)) agpinfo.mode &= ~0x00000002;
- drm_agp_p->enable(agpinfo.mode);
+ drm_agp_p->enable(agp_bridge, agpinfo.mode);
*ap_phys_base = (void*) agpinfo.aper_base;
*ap_mapped_base = (void*) gart.aperture;
@@ -182,7 +182,7 @@
failed:
MTRR_DEL(gart); /* checks gart.mtrr */
- drm_agp_p->release();
+ drm_agp_p->release(agp_bridge);
inter_module_put("drm_agp");
return -1;
@@ -213,7 +213,7 @@
NV_IOUNMAP(gart.aperture, RM_PAGE_SIZE);
}
- drm_agp_p->release();
+ drm_agp_p->release(agp_bridge);
inter_module_put("drm_agp");
- drm_agp_p->enable(agpinfo.mode);
+ drm_agp_p->enable(agp_bridge, agpinfo.mode);
*ap_phys_base = (void*) agpinfo.aper_base;
*ap_mapped_base = (void*) gart.aperture;
@@ -182,7 +182,7 @@
failed:
MTRR_DEL(gart); /* checks gart.mtrr */
- drm_agp_p->release();
+ drm_agp_p->release(agp_bridge);
inter_module_put("drm_agp");
return -1;
@@ -213,7 +213,7 @@
NV_IOUNMAP(gart.aperture, RM_PAGE_SIZE);
}
- drm_agp_p->release();
+ drm_agp_p->release(agp_bridge);
inter_module_put("drm_agp");
@@ -262,7 +262,7 @@
return RM_ERROR;
}
- ptr = drm_agp_p->allocate_memory(PageCount, AGP_NORMAL_MEMORY);
+ ptr = drm_agp_p->allocate_memory(agp_bridge, PageCount, AGP_NORMAL_MEMORY);
if (ptr == NULL)
{
*pAddress = (void*) 0;
|
Nachdem ich die Änderungen vorgenommen hatte, habe ich auch ein "ebuild NAME_DES_NVIDIA_KERNELS.ebuild digest" ausgeführt.
Bei dem Emergen wird mir dann aber mitgeteilt, dass die zu patchende Datei nicht gefudnen wurde.
Hier der Output von patch:
| Quote: |
***** n.patch *****
===================
PATCH COMMAND: patch -p0 -g0 < /usr/portage/media-video/nvidia-kernel/files/1.0.662$
===================
(Patch is indented 1 space.)
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/src/nv/os-agp.c.6629 2005-01-09 15:28:42.000000000 -0500
| +++ /usr/src/nv/os-agp.c 2005-01-09 15:30:00.000000000 -0500
--------------------------
No file to patch. Skipping patch.
patch: **** malformed patch at line 4: * the memory controller.
===================
PATCH COMMAND: patch -p1 -g0 < /usr/portage/media-video/nvidia-kernel/files/1.0.662$
===================
(Patch is indented 1 space.)
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/src/nv/os-agp.c.6629 2005-01-09 15:28:42.000000000 -0500
| +++ /usr/src/nv/os-agp.c 2005-01-09 15:30:00.000000000 -0500
--------------------------
No file to patch. Skipping patch.
patch: **** malformed patch at line 4: * the memory controller.
===================
PATCH COMMAND: patch -p2 -g0 < /usr/portage/media-video/nvidia-kernel/files/1.0.662$
===================
(Patch is indented 1 space.)
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/src/nv/os-agp.c.6629 2005-01-09 15:28:42.000000000 -0500
| +++ /usr/src/nv/os-agp.c 2005-01-09 15:30:00.000000000 -0500
--------------------------
(Patch is indented 1 space.)
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/src/nv/os-agp.c.6629 2005-01-09 15:28:42.000000000 -0500
| +++ /usr/src/nv/os-agp.c 2005-01-09 15:30:00.000000000 -0500
--------------------------
No file to patch. Skipping patch.
patch: **** malformed patch at line 4: * the memory controller.
===================
PATCH COMMAND: patch -p2 -g0 < /usr/portage/media-video/nvidia-kernel/files/1.0.662$
===================
(Patch is indented 1 space.)
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/src/nv/os-agp.c.6629 2005-01-09 15:28:42.000000000 -0500
| +++ /usr/src/nv/os-agp.c 2005-01-09 15:30:00.000000000 -0500
--------------------------
No file to patch. Skipping patch.
patch: **** malformed patch at line 4: * the memory controller.
===================
PATCH COMMAND: patch -p3 -g0 < /usr/portage/media-video/nvidia-kernel/files/1.0.662$
===================
(Patch is indented 1 space.)
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/src/nv/os-agp.c.6629 2005-01-09 15:28:42.000000000 -0500
| +++ /usr/src/nv/os-agp.c 2005-01-09 15:30:00.000000000 -0500
--------------------------
No file to patch. Skipping patch.
patch: **** malformed patch at line 4: * the memory controller.
===================
PATCH COMMAND: patch -p4 -g0 < /usr/portage/media-video/nvidia-kernel/files/1.0.662$
--------------------------
No file to patch. Skipping patch.
patch: **** malformed patch at line 4: * the memory controller.
===================
PATCH COMMAND: patch -p3 -g0 < /usr/portage/media-video/nvidia-kernel/files/1.0.662$
===================
(Patch is indented 1 space.)
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- /usr/src/nv/os-agp.c.6629 2005-01-09 15:28:42.000000000 -0500
| +++ /usr/src/nv/os-agp.c 2005-01-09 15:30:00.000000000 -0500
--------------------------
No file to patch. Skipping patch.
patch: **** malformed patch at line 4: * the memory controller.
===================
PATCH COMMAND: patch -p4 -g0 < /usr/portage/media-video/nvidia-kernel/files/1.0.662$
===================
(Patch is indented 1 space.)
patching file os-agp.c
patch: **** malformed patch at line 4: * the memory controller.
|
Was muss ich den tun, damit der Patch funktioniert? -Die Dateipfade stimmen...
Ist es möglich, dass ich was an meinen Änderugnen, die ich am ebuild vorgenommen habe ändern muss (wg. -p3)?
Schonmal vielen Dank für eure Hilfe im Voraus!
MFG |
|
| Back to top |
|
 |
Xe
Apprentice
Joined: 02 Sep 2004
Posts: 254
Location: Karlsruhe, Germany
|
| Posted: Sun Feb 20, 2005 4:53 pm Post subject: |
|
|
Hi!
Ich habe gerade gelesen, dass man dafür das s.g. Portdir-Overlay verwenden soll. Aber wie genau mache ich das? und was ist überhaupt diese Portidir-Overlay?
MFG |
|
| Back to top |
|
|
|
|
You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum
|
|
Deutsches Forum (German)
