diff options
author | Dave Airlie <airlied@redhat.com> | 2013-09-04 00:28:53 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-09-04 00:28:53 -0400 |
commit | d30645ae1830f458b3a4908a2f869dd53e0c179b (patch) | |
tree | 1bebcf449ab043da0fd5a90ee466131bc0f6ee47 /net/dsa | |
parent | ef25bd84edba73f78ce7397ef3d7b97e2774ed07 (diff) | |
parent | c859074e7d804a254f318bb55ba1b39893247fc7 (diff) |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
Nothing major ready for merging yet, so mostly bug fixes below, in addition to VP3 enablement from Ilia.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau: fix command submission to use vmalloc for big allocations
drm/nouveau/bios/therm: handle vbioses with duplicate entries (mostly nva5)
drm/nouveau: use MSI interrupts
drm/nv50-/kms: assume analog display connected if load on any pin
drm/nv50/disp: prevent false output detection on the original nv50
drm/nouveau/i2c: pass the function pointers in at creation time
drm/nouveau/therm: survive to suspend/resume cycles
drm/nouveau/timer: add a way to cancel alarms
drm/nouveau/timer: restore the time on resume
drm/nouveau/fan: restore pwm value on resume when in manual/auto mode
drm/nouveau/therm: Set the correct pwm_mode upon resume
drm/nouveau: require contiguous bo for framebuffer
drm/nv50-/disp: use the number of dac, sor, pior rather than hardcoded values
drm/nouveau: remove duplicate copy of nv44_graph_class
drm/nouveau/vdec: implement support for VP3 engines
drm/nouveau/core: get rid of math.h, replace log2i with order_base_2
Diffstat (limited to 'net/dsa')
0 files changed, 0 insertions, 0 deletions