diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-14 10:49:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-14 10:49:40 +1000 |
| commit | f2c488212b511f7eadef78c564f1bff8f64db231 (patch) | |
| tree | 0c4cf14f0040458e0ca9b850f906c832563729a1 /drivers/gpu | |
| parent | 67d1c0a25c05e2105d12abd9c0172d2d5c0e7654 (diff) | |
| parent | 52829d4fabaf71748f16126d421dbefbfcf1319a (diff) | |
| download | linux-f2c488212b511f7eadef78c564f1bff8f64db231.tar.gz linux-f2c488212b511f7eadef78c564f1bff8f64db231.tar.bz2 linux-f2c488212b511f7eadef78c564f1bff8f64db231.zip | |
Merge branch 'linux-4.6' of git://github.com/skeggsb/linux into drm-next
- GM20x secure boot support (hence, acceleration, finally \o/)
- GM200 support
- GM20B clock driver
- Support for power sensors on some GPUs
- Various other fixes all over the place
* 'linux-4.6' of git://github.com/skeggsb/linux: (95 commits)
drm/nouveau/clk/gm20b: add basic driver
drm/nouveau/clk/gk20a: share reusable structures/functions
drm/nouveau/clk/gk20a: set lowest frequency during init()
drm/nouveau/clk/gk20a: split gk20a_clk_new()
drm/nouveau/clk/gk20a: abstract pl_to_div
drm/nouveau/clk/gk20a: put mnp values into their own struct
drm/nouveau/clk/gk20a: emit parent rate as debug message
drm/nouveau/clk/gk20a: only restore divider to 1:1 if needed
drm/nouveau/clk/gk20a: only compute n_lo if needed
drm/nouveau/clk/gk20a: fix VCO bit mask
drm/nouveau/clk/gk20a: rename enable/disable functions
drm/nouveau/clk/gk20a: reorganize variables in gk20a_pllg_calc_mnp()
drm/nouveau/clk/gk20a: convert parameters to Khz
drm/nouveau/volt: add GM20B driver
drm/nouveau/volt/gk20a: split constructor
drm/nouveau/volt/gk20a: share reusable members & functions
drm/nouveau/ce/gm107: expose MaxwellDmaCopyA
drm/nouveau/fifo/gm107: KeplerChannelGpfifoB, and 2048 channels
drm/nouveau/fifo/gk110: expose KeplerChannelGpfifoB
drm/nouveau/fifo/gk104: submit NOP after all PBDMA_INTR_0, not just DEVICE
...
Diffstat (limited to 'drivers/gpu')