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 ...
No related branches found
No related tags found
Showing
- drivers/gpu/drm/nouveau/include/nvif/cla06f.h 17 additions, 9 deletionsdrivers/gpu/drm/nouveau/include/nvif/cla06f.h
- drivers/gpu/drm/nouveau/include/nvif/class.h 3 additions, 2 deletionsdrivers/gpu/drm/nouveau/include/nvif/class.h
- drivers/gpu/drm/nouveau/include/nvif/device.h 1 addition, 0 deletionsdrivers/gpu/drm/nouveau/include/nvif/device.h
- drivers/gpu/drm/nouveau/include/nvkm/core/device.h 73 additions, 54 deletionsdrivers/gpu/drm/nouveau/include/nvkm/core/device.h
- drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h 11 additions, 0 deletionsdrivers/gpu/drm/nouveau/include/nvkm/core/firmware.h
- drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h 4 additions, 0 deletionsdrivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h
- drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h 2 additions, 1 deletiondrivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
- drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h 1 addition, 1 deletiondrivers/gpu/drm/nouveau/include/nvkm/engine/disp.h
- drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h 3 additions, 1 deletiondrivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
- drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h 1 addition, 2 deletionsdrivers/gpu/drm/nouveau/include/nvkm/engine/gr.h
- drivers/gpu/drm/nouveau/include/nvkm/engine/msenc.h 4 additions, 0 deletionsdrivers/gpu/drm/nouveau/include/nvkm/engine/msenc.h
- drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h 4 additions, 0 deletionsdrivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h
- drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h 4 additions, 0 deletionsdrivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h
- drivers/gpu/drm/nouveau/include/nvkm/engine/vic.h 4 additions, 0 deletionsdrivers/gpu/drm/nouveau/include/nvkm/engine/vic.h
- drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/extdev.h 3 additions, 0 deletionsdrivers/gpu/drm/nouveau/include/nvkm/subdev/bios/extdev.h
- drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h 16 additions, 0 deletionsdrivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h
- drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h 1 addition, 0 deletionsdrivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h
- drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h 1 addition, 1 deletiondrivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h
- drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h 32 additions, 1 deletiondrivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h
- drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h 1 addition, 1 deletiondrivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h
Loading
Please register or sign in to comment