Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next

Browse source

- 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
  ...

...

This commit is contained in:

Dave Airlie 2014-03-26 14:34:16 +10:00

parent 23c73b24a0 40189b0c65

commit e954a2044e

157 changed files with 10347 additions and 4726 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

16

drivers/gpu/drm/nouveau/Makefile

View file

2

drivers/gpu/drm/nouveau/core/core/namedb.c

View file

2

drivers/gpu/drm/nouveau/core/core/parent.c

View file

85

drivers/gpu/drm/nouveau/core/engine/device/base.c

View file

106

drivers/gpu/drm/nouveau/core/engine/device/gm100.c

View file

4

drivers/gpu/drm/nouveau/core/engine/device/nv04.c

View file

16

drivers/gpu/drm/nouveau/core/engine/device/nv10.c

View file

8

drivers/gpu/drm/nouveau/core/engine/device/nv20.c

View file

10

drivers/gpu/drm/nouveau/core/engine/device/nv30.c

View file

32

drivers/gpu/drm/nouveau/core/engine/device/nv40.c

View file

28

drivers/gpu/drm/nouveau/core/engine/device/nv50.c

View file

44

drivers/gpu/drm/nouveau/core/engine/device/nvc0.c

View file

20

drivers/gpu/drm/nouveau/core/engine/device/nve0.c

View file

10

drivers/gpu/drm/nouveau/core/engine/disp/dport.c

View file

101

drivers/gpu/drm/nouveau/core/engine/disp/gm107.c

View file

12

drivers/gpu/drm/nouveau/core/engine/disp/nv04.c

View file

364

drivers/gpu/drm/nouveau/core/engine/disp/nv50.c

View file

54

drivers/gpu/drm/nouveau/core/engine/disp/nv50.h

View file

191

drivers/gpu/drm/nouveau/core/engine/disp/nv84.c

View file

50

drivers/gpu/drm/nouveau/core/engine/disp/nv94.c

View file

67

drivers/gpu/drm/nouveau/core/engine/disp/nva0.c

View file

22

drivers/gpu/drm/nouveau/core/engine/disp/nva3.c

View file

361

drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c

View file

187

drivers/gpu/drm/nouveau/core/engine/disp/nve0.c

View file

22

drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c

View file

10

drivers/gpu/drm/nouveau/core/engine/disp/priv.h

View file

3

drivers/gpu/drm/nouveau/core/engine/dmaobj/nvd0.c

View file

6

drivers/gpu/drm/nouveau/core/engine/falcon.c

View file

2

drivers/gpu/drm/nouveau/core/engine/fifo/base.c

View file

561

drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c

View file

507

drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c

View file

989

drivers/gpu/drm/nouveau/core/engine/graph/ctxgm107.c

View file

1041

drivers/gpu/drm/nouveau/core/engine/graph/ctxnv108.c

View file

308

drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c

View file

170

drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.h

View file

270

drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc1.c

View file

78

drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc3.c → drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc4.c

View file

144

drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc8.c

View file

216

drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd7.c

View file

278

drivers/gpu/drm/nouveau/core/engine/graph/ctxnvd9.c

View file

285

drivers/gpu/drm/nouveau/core/engine/graph/ctxnve4.c

View file

784

drivers/gpu/drm/nouveau/core/engine/graph/ctxnvf0.c

View file

2

drivers/gpu/drm/nouveau/core/engine/graph/fuc/com.fuc

View file

7

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc

View file

42

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcgm107.fuc5

View file

473

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcgm107.fuc5.h

View file

356

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnv108.fuc5.h

View file

340

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h

View file

400

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvd7.fuc.h

View file

400

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc.h

View file

400

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvf0.fuc.h

View file

40

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubgm107.fuc5

View file

916

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubgm107.fuc5.h

View file

2

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5.h

View file

2

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h

View file

2

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvd7.fuc.h

View file

2

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc.h

View file

2

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvf0.fuc.h

View file

1

drivers/gpu/drm/nouveau/core/engine/graph/fuc/macros.fuc

View file

465

drivers/gpu/drm/nouveau/core/engine/graph/gm107.c

View file

139

drivers/gpu/drm/nouveau/core/engine/graph/nv108.c

View file

2

drivers/gpu/drm/nouveau/core/engine/graph/nv20.c

View file

2

drivers/gpu/drm/nouveau/core/engine/graph/nv40.c

View file

45

drivers/gpu/drm/nouveau/core/engine/graph/nv50.c

View file

310

drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c

View file

196

drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h

View file

115

drivers/gpu/drm/nouveau/core/engine/graph/nvc1.c

View file

86

drivers/gpu/drm/nouveau/core/engine/graph/nvc3.c → drivers/gpu/drm/nouveau/core/engine/graph/nvc4.c

View file

104

drivers/gpu/drm/nouveau/core/engine/graph/nvc8.c

View file

175

drivers/gpu/drm/nouveau/core/engine/graph/nvd7.c

View file

154

drivers/gpu/drm/nouveau/core/engine/graph/nvd9.c

View file

192

drivers/gpu/drm/nouveau/core/engine/graph/nve4.c

View file

136

drivers/gpu/drm/nouveau/core/engine/graph/nvf0.c

View file

2

drivers/gpu/drm/nouveau/core/engine/xtensa.c

View file

12

drivers/gpu/drm/nouveau/core/include/core/class.h

View file

31

drivers/gpu/drm/nouveau/core/include/core/device.h

View file

2

drivers/gpu/drm/nouveau/core/include/core/namedb.h

View file

18

drivers/gpu/drm/nouveau/core/include/engine/device.h

View file

19

drivers/gpu/drm/nouveau/core/include/engine/disp.h

View file

3

drivers/gpu/drm/nouveau/core/include/engine/graph.h

View file

23

drivers/gpu/drm/nouveau/core/include/subdev/bios/P0260.h

View file

1

drivers/gpu/drm/nouveau/core/include/subdev/bios/conn.h

View file

2

drivers/gpu/drm/nouveau/core/include/subdev/bios/ramcfg.h

View file

7

drivers/gpu/drm/nouveau/core/include/subdev/bios/therm.h

View file

2

drivers/gpu/drm/nouveau/core/include/subdev/devinit.h

View file

1

drivers/gpu/drm/nouveau/core/include/subdev/fb.h

View file

3

drivers/gpu/drm/nouveau/core/include/subdev/ltcg.h

View file

1

drivers/gpu/drm/nouveau/core/include/subdev/mc.h

View file

2

drivers/gpu/drm/nouveau/core/include/subdev/therm.h

View file

1

drivers/gpu/drm/nouveau/core/include/subdev/timer.h

View file

12

drivers/gpu/drm/nouveau/core/os.h

View file

4

drivers/gpu/drm/nouveau/core/subdev/bar/base.c

View file

8

drivers/gpu/drm/nouveau/core/subdev/bar/nv50.c

View file

15

drivers/gpu/drm/nouveau/core/subdev/bar/nvc0.c

View file

109

drivers/gpu/drm/nouveau/core/subdev/bios/P0260.c

View file

55

drivers/gpu/drm/nouveau/core/subdev/bios/base.c

View file

29

drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c

View file

18

drivers/gpu/drm/nouveau/core/subdev/bios/init.c

View file

9

drivers/gpu/drm/nouveau/core/subdev/bios/ramcfg.c

View file

11

drivers/gpu/drm/nouveau/core/subdev/bios/therm.c

View file

Some files were not shown because too many files have changed in this diff Show more