diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-07-30 06:49:57 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-07-30 06:49:57 (GMT) |
| commit | e9e3c8a20b2ac89a5770a6bb0a1d0dafc7f0edb0 (patch) | |
| tree | 160b7db4ee3b4aaa232f6bd788eef82ce609fdc3 /include | |
| parent | ca089b7266337c144a17a890c5168f4db205ba85 (diff) | |
| parent | 7a7da592cbb22a1d360638dbecc393470c5effe3 (diff) | |
| download | linux-e9e3c8a20b2ac89a5770a6bb0a1d0dafc7f0edb0.tar.xz | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6
nouveau fixes a number of regressions and a few user triggerable oops
since -rc1. Along with a few mpeg engine fixes.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau: fix semaphore dmabuf obj
drm/nouveau/vm: make vm refcount into a kref
drm/nv31/mpeg: don't recognize nv3x cards as having nv44 graph class
drm/nv40/mpeg: write magic value to channel object to make it work
drm/nouveau: fix size check for cards without vm
drm/nv50-/disp: remove dcb_outp_match call, and related variables
drm/nva3-/disp: fix hda eld writing, needs to be padded
drm/nv31/mpeg: fix mpeg engine initialization
drm/nv50/mc: include vp in the fb error reporting mask
drm/nouveau: fix null pointer dereference in poll_changed
drm/nv50/gpio: post-nv92 cards have 32 interrupt lines
drm/nvc0/fb: take lock in nvc0_ram_put()
drm/nouveau/core: xtensa firmware size needs to be 0x40000 no matter what
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions