Merge branch 'drm-nouveau-next' of...
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next - first stage of (ongoing) gpu fault recovery work - initial support for maxwell (binary driver fw needed) - various random fixes across the board * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (87 commits) drm/nouveau: fix missing newline drm/nouveau/bios: fetch the vbios from PROM using only aligned 32-bit accesses drm/nouveau/therm: let the vbios decide on the automatic fan management mode drm/nvd7/therm: handle another kind of PWM fans drm/nouveau/pm/fan: drop the fan lock in fan_update() before rescheduling drm/nouveau: fix small thinko in vblank timestamping. drm/nouveau/therm: check for sensor presence with requested mode, not current drm/nouveau/disp/dp: allow 540MHz data rate drm/nouveau: recognise higher link rate for available dp bw calculations drm/nouveau/disp: limit dp capabilities as per dcb drm/nva3/fbram: restrict training pattern setup to GT218 drm/nva3/devinit: restrict script access to some PFB regs drm/nouveau/devinit: add interface to check if a mmio access by scripts is ok drm/nouveau/bios: have strap reads show on devinit spam debug level drm/nv50/gpio: fixup reset for gpios >= 16 drm/nv50/gpio: exclude sense value from mask when changing registers drm/gk104/gr: therm magic needed on some kepler boards drm/gm107/gr: initial support drm/gf100-/gf: fix a stupid typo, waiting on wrong signal for mmctx drm/nouveau/bios: parsing of some random table needed to bring up gr ...
No related branches found
No related tags found
Showing
- drivers/gpu/drm/nouveau/Makefile 13 additions, 3 deletionsdrivers/gpu/drm/nouveau/Makefile
- drivers/gpu/drm/nouveau/core/core/namedb.c 1 addition, 1 deletiondrivers/gpu/drm/nouveau/core/core/namedb.c
- drivers/gpu/drm/nouveau/core/core/parent.c 1 addition, 1 deletiondrivers/gpu/drm/nouveau/core/core/parent.c
- drivers/gpu/drm/nouveau/core/engine/device/base.c 80 additions, 5 deletionsdrivers/gpu/drm/nouveau/core/engine/device/base.c
- drivers/gpu/drm/nouveau/core/engine/device/gm100.c 106 additions, 0 deletionsdrivers/gpu/drm/nouveau/core/engine/device/gm100.c
- drivers/gpu/drm/nouveau/core/engine/device/nv04.c 2 additions, 2 deletionsdrivers/gpu/drm/nouveau/core/engine/device/nv04.c
- drivers/gpu/drm/nouveau/core/engine/device/nv10.c 8 additions, 8 deletionsdrivers/gpu/drm/nouveau/core/engine/device/nv10.c
- drivers/gpu/drm/nouveau/core/engine/device/nv20.c 4 additions, 4 deletionsdrivers/gpu/drm/nouveau/core/engine/device/nv20.c
- drivers/gpu/drm/nouveau/core/engine/device/nv30.c 5 additions, 5 deletionsdrivers/gpu/drm/nouveau/core/engine/device/nv30.c
- drivers/gpu/drm/nouveau/core/engine/device/nv40.c 16 additions, 16 deletionsdrivers/gpu/drm/nouveau/core/engine/device/nv40.c
- drivers/gpu/drm/nouveau/core/engine/device/nv50.c 14 additions, 14 deletionsdrivers/gpu/drm/nouveau/core/engine/device/nv50.c
- drivers/gpu/drm/nouveau/core/engine/device/nvc0.c 22 additions, 22 deletionsdrivers/gpu/drm/nouveau/core/engine/device/nvc0.c
- drivers/gpu/drm/nouveau/core/engine/device/nve0.c 10 additions, 10 deletionsdrivers/gpu/drm/nouveau/core/engine/device/nve0.c
- drivers/gpu/drm/nouveau/core/engine/disp/dport.c 9 additions, 1 deletiondrivers/gpu/drm/nouveau/core/engine/disp/dport.c
- drivers/gpu/drm/nouveau/core/engine/disp/gm107.c 101 additions, 0 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/gm107.c
- drivers/gpu/drm/nouveau/core/engine/disp/nv04.c 6 additions, 6 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nv04.c
- drivers/gpu/drm/nouveau/core/engine/disp/nv50.c 344 additions, 26 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nv50.c
- drivers/gpu/drm/nouveau/core/engine/disp/nv50.h 53 additions, 1 deletiondrivers/gpu/drm/nouveau/core/engine/disp/nv50.h
- drivers/gpu/drm/nouveau/core/engine/disp/nv84.c 186 additions, 5 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nv84.c
- drivers/gpu/drm/nouveau/core/engine/disp/nv94.c 45 additions, 5 deletionsdrivers/gpu/drm/nouveau/core/engine/disp/nv94.c
Loading
Please register or sign in to comment