Merge branch 'linux-3.19' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
- Tegra K1 voltage support, and coherency improvements - GM204 support (modesetting, still waiting on NVIDIA for signed fw to proceed further), and a lot of bios/i2c/devinit adjustments needed to support it - GT21x memory reclocking work - Various other bits and pieces, most of which are prep-work for a couple of bigger projects I didn't get finished in time * 'linux-3.19' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (73 commits) drm/nv50/kms: drop requirement that framebuffer bos be contig up-front drm/nv50/kms: directly use cursor image from userspace buffer drm/nouveau/kms: when pinning display-related buffers, force contig vram drm/nouveau: teach nouveau_bo_pin() how to force a contig vram allocation drm/nouveau/volt: add support for GK20A drm/nouveau/platform: add GPU speedo information to nouveau platform drm/nouveau/volt: allow non-bios voltage scaling drm/gf100-/gr: return non-fatal error code when fw not present drm/nouveau/devinit: bump priv ring timeouts before executing scripts drm/nouveau/bios: translate ramcfg strap through M0203 drm/nouveau/fb: make use of M0203 routines for ram type determination drm/nouveau/bios: add parsing of BIT M(v2) +0x03 table drm/nouveau/core: allow vbios parsing without knowing chipset type drm/nouveau/lib: add null backend drm/nouveau/device: store revision drm/nouveau/core: add some forgotten subdevs to disable mask drm/gk20a/clk: fix max VCO value drm/nouveau: we need pin_refcnt for nouveau_bo_placement_set() drm/nv50-/kms: add some evo tracing ability for debugging drm/nv50/kms: use sclass() instead of trial-and-error ...
Showing
- drivers/gpu/drm/nouveau/Makefile 18 additions, 0 deletionsdrivers/gpu/drm/nouveau/Makefile
- drivers/gpu/drm/nouveau/core/core/handle.c 0 additions, 113 deletionsdrivers/gpu/drm/nouveau/core/core/handle.c
- drivers/gpu/drm/nouveau/core/engine/device/base.c 12 additions, 2 deletionsdrivers/gpu/drm/nouveau/core/engine/device/base.c
- drivers/gpu/drm/nouveau/core/engine/device/gm100.c 43 additions, 0 deletionsdrivers/gpu/drm/nouveau/core/engine/device/gm100.c
- drivers/gpu/drm/nouveau/core/engine/device/nve0.c 1 addition, 0 deletionsdrivers/gpu/drm/nouveau/core/engine/device/nve0.c
- drivers/gpu/drm/nouveau/core/engine/disp/dport.c 6 additions, 3 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/dport.c
- drivers/gpu/drm/nouveau/core/engine/disp/gm107.c 8 additions, 8 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/gm107.c
- drivers/gpu/drm/nouveau/core/engine/disp/gm204.c 114 additions, 0 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/gm204.c
- drivers/gpu/drm/nouveau/core/engine/disp/nv50.c 48 additions, 46 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nv50.c
- drivers/gpu/drm/nouveau/core/engine/disp/nv50.h 34 additions, 29 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nv50.h
- drivers/gpu/drm/nouveau/core/engine/disp/nv84.c 20 additions, 20 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nv84.c
- drivers/gpu/drm/nouveau/core/engine/disp/nv94.c 15 additions, 15 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nv94.c
- drivers/gpu/drm/nouveau/core/engine/disp/nva0.c 8 additions, 8 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nva0.c
- drivers/gpu/drm/nouveau/core/engine/disp/nva3.c 8 additions, 8 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nva3.c
- drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c 56 additions, 43 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nvd0.c
- drivers/gpu/drm/nouveau/core/engine/disp/nve0.c 15 additions, 15 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nve0.c
- drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c 8 additions, 8 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nvf0.c
- drivers/gpu/drm/nouveau/core/engine/disp/outp.c 4 additions, 1 deletiondrivers/gpu/drm/nouveau/core/engine/disp/outp.c
- drivers/gpu/drm/nouveau/core/engine/disp/sorgm204.c 144 additions, 0 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/sorgm204.c
- drivers/gpu/drm/nouveau/core/engine/disp/sornvd0.c 1 addition, 1 deletiondrivers/gpu/drm/nouveau/core/engine/disp/sornvd0.c
Loading
Please register or sign in to comment