[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Linux features for wheezy



On 2012-06-04 20:42 +0200, Julien Cristau wrote:

> We'll probably also need some nouveau updates to (at least) update to
> the 1.0.0 ABI, I haven't had time to look at this at all, but I think
> Maarten had a backport at
> http://people.canonical.com/~mlankhorst/drm-abi-patches.tgz but doesn't
> have the hw to test them.

We may have a volunteer now (Michele, CC'ed), but the patchset does not
cleanly apply to the 3.2.21 kernel:

,----
| $ tar xf ../drm-abi-patches.tgz -O | patch -Np1 --dry-run 
| patching file drivers/gpu/drm/nouveau/nouveau_drv.h
| patching file drivers/gpu/drm/nouveau/nvd0_display.c
| patching file drivers/gpu/drm/nouveau/nouveau_drv.h
| Hunk #1 succeeded at 292 (offset 2 lines).
| patching file drivers/gpu/drm/nouveau/nouveau_channel.c
| Hunk #1 succeeded at 425 (offset -9 lines).
| patching file drivers/gpu/drm/nouveau/nouveau_dma.h
| patching file drivers/gpu/drm/nouveau/nouveau_channel.c
| patching file drivers/gpu/drm/nouveau/nouveau_dma.c
| patching file drivers/gpu/drm/nouveau/nouveau_drv.h
| Hunk #1 succeeded at 1032 (offset 2 lines).
| patching file drivers/gpu/drm/nouveau/nouveau_state.c
| patching file drivers/gpu/drm/nouveau/nouveau_display.c
| patching file drivers/gpu/drm/nouveau/nouveau_drv.h
| Hunk #1 FAILED at 1672.
| 1 out of 1 hunk FAILED -- saving rejects to file drivers/gpu/drm/nouveau/nouveau_drv.h.rej
| patching file drivers/gpu/drm/nouveau/nvc0_fifo.c
| patching file drivers/gpu/drm/nouveau/nvc0_graph.c
| patching file drivers/gpu/drm/nouveau/nouveau_fence.c
| patching file drivers/gpu/drm/nouveau/nouveau_drv.h
| Hunk #1 succeeded at 1662 (offset 2 lines).
| patching file drivers/gpu/drm/nouveau/nouveau_fence.c
| patching file drivers/gpu/drm/nouveau/nv50_display.c
| patching file drivers/gpu/drm/nouveau/nouveau_bo.c
| patching file drivers/gpu/drm/nouveau/nouveau_drv.h
| patching file drivers/gpu/drm/nouveau/nouveau_gem.c
`----

Maarten, could you rebase the patches?

Cheers,
       Sven


Reply to: