diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-22 03:35:02 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-22 03:35:02 +0100 |
| commit | bdfcea4bdcd354023b1a93abdaf6b176c3dd545b (patch) | |
| tree | 7cd92cdbb6c9fa473f4b896e8bd22e9dc8cbc28e /drivers/gpio/gpiolib-of.c | |
| parent | Merge remote-tracking branch 'origin/master' into drm-next (diff) | |
| parent | drm/nouveau: finalise nvkm namespace switch (no binary change) (diff) | |
| download | linux-bdfcea4bdcd354023b1a93abdaf6b176c3dd545b.tar.xz linux-bdfcea4bdcd354023b1a93abdaf6b176c3dd545b.zip | |
Merge branch 'linux-3.20' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
There's a huge amount of no-op churn here renaming the majority of the
driver from nouveau_ to nvkm_, in preparation for splitting the module
into two down the track. Also switched to NVIDIA's unit and chipset
names at the same time. Despite the massive amount of code touch, the
commits should be safe as objdump was used to verify nothing got
changed accidentally in the renames.
Aside from that, not much in this first pull request:
- nouveau_platform.ko for GK20A was merged into nouveau.ko
- GK20A dynamic reclocking support
- no more vt-switches across suspend/resume
- changed output scaling policy. if the mode comes from the display's
edid, we program that directly rather than using the gpu to scale to
the panel's native mode. this should address complaints of having to
jump through hoops for 24/120Hz modes etc
- various other minor fixups and cleanups
* 'linux-3.20' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (86 commits)
drm/nouveau: finalise nvkm namespace switch (no binary change)
drm/nouveau/device: namespace + nvidia gpu names (no binary change)
drm/nouveau/vp: namespace + nvidia gpu names (no binary change)
drm/nouveau/sw: namespace + nvidia gpu names (no binary change)
drm/nouveau/sec: namespace + nvidia gpu names (no binary change)
drm/nouveau/pm: namespace + nvidia gpu names (no binary change)
drm/nouveau/msvld: namespace + nvidia gpu names (no binary change)
drm/nouveau/msppp: namespace + nvidia gpu names (no binary change)
drm/nouveau/mspdec: namespace + nvidia gpu names (no binary change)
drm/nouveau/mpeg: namespace + nvidia gpu names (no binary change)
drm/nouveau/gr: namespace + nvidia gpu names (no binary change)
drm/nouveau/fifo: namespace + nvidia gpu names (no binary change)
drm/nouveau/dmaobj: namespace + nvidia gpu names (no binary change)
drm/nouveau/disp: namespace + nvidia gpu names (no binary change)
drm/nouveau/cipher: namespace + nvidia gpu names (no binary change)
drm/nouveau/ce: namespace + nvidia gpu names (no binary change)
drm/nouveau/bsp: namespace + nvidia gpu names (no binary change)
drm/nouveau/volt: namespace + nvidia gpu names (no binary change)
drm/nouveau/timer: namespace + nvidia gpu names (no binary change)
drm/nouveau/therm: namespace + nvidia gpu names (no binary change)
...
Diffstat (limited to 'drivers/gpio/gpiolib-of.c')
0 files changed, 0 insertions, 0 deletions