Merge branch 'linux-4.11' of git://github.com/skeggsb/linux into drm-next

Browse source

- Rework of the secure boot code, in preparation for GP10x secure boot.
- Improvements to channel recovery
- Initial power budget code
- Some preparation for an upcoming MMU rework (probably 4.12)
- Misc other fixes.

* 'linux-4.11' of git://github.com/skeggsb/linux: (88 commits)
  drm/nouveau/tmr: provide backtrace when a timeout is hit
  drm/nouveau/pci/g92: Fix rearm
  drm/nouveau/drm/therm/fan: add a fallback if no fan control is specified in the vbios
  drm/nouveau/hwmon: expose power_max and power_crit
  drm/nouveau/iccsense: Parse max and crit power level
  drm/nouveau/bios/power_budget: Add basic power budget parsing
  drm/nouveau/fifo/gk104-: preempt recovery
  drm/nouveau/fifo/gk104-: trigger mmu fault before attempting engine recovery
  drm/nouveau/fifo/gk104-: ACK SCHED_ERROR before attempting CTXSW_TIMEOUT recovery
  drm/nouveau/fifo/gk104-: directly use new recovery code for ctxsw timeout
  drm/nouveau/fifo/gk104-: directly use new recovery code for mmu faults
  drm/nouveau/fifo/gk104-: reset all engines a killed channel is still active on
  drm/nouveau/fifo/gk104-: refactor recovery code
  drm/nouveau/fifo/gk104-: better detection of chid when parsing engine status
  drm/nouveau/fifo/gk104-: separate out engine status parsing
  drm/nouveau/fifo: add an api for initiating channel recovery
  drm/nouveau/top: add function to translate subdev index to mmu fault id
  drm/nouveau/gr/gf100-: implement chsw_load() method
  drm/nouveau/gr: implement chsw_load() method
  drm/nouveau/core: add engine method to assist in determining chsw direction
  ...

...

This commit is contained in:

Dave Airlie 2017-02-17 17:43:07 +10:00

parent 9ca70356a9 eb875d87d9

commit 8fd4a62d87

144 changed files with 4558 additions and 3000 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

6

drivers/gpu/drm/nouveau/dispnv04/arb.c

View file

43

drivers/gpu/drm/nouveau/dispnv04/crtc.c

View file

2

drivers/gpu/drm/nouveau/dispnv04/cursor.c

View file

18

drivers/gpu/drm/nouveau/dispnv04/dac.c

View file

12

drivers/gpu/drm/nouveau/dispnv04/dfp.c

View file

6

drivers/gpu/drm/nouveau/dispnv04/disp.c

View file

6

drivers/gpu/drm/nouveau/dispnv04/disp.h

View file

80

drivers/gpu/drm/nouveau/dispnv04/hw.c

View file

42

drivers/gpu/drm/nouveau/dispnv04/hw.h

View file

16

drivers/gpu/drm/nouveau/dispnv04/overlay.c

View file

4

drivers/gpu/drm/nouveau/dispnv04/tvnv04.c

View file

16

drivers/gpu/drm/nouveau/dispnv04/tvnv17.c

View file

4

drivers/gpu/drm/nouveau/dispnv04/tvnv17.h

View file

2

drivers/gpu/drm/nouveau/include/nvif/cl826e.h

View file

2

drivers/gpu/drm/nouveau/include/nvif/cl826f.h

View file

3

drivers/gpu/drm/nouveau/include/nvif/cl906f.h

View file

3

drivers/gpu/drm/nouveau/include/nvif/cla06f.h

View file

30

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

View file

3

drivers/gpu/drm/nouveau/include/nvif/client.h

View file

6

drivers/gpu/drm/nouveau/include/nvif/driver.h

View file

11

drivers/gpu/drm/nouveau/include/nvif/if0000.h

View file

20

drivers/gpu/drm/nouveau/include/nvkm/core/client.h

View file

2

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

View file

2

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

View file

7

drivers/gpu/drm/nouveau/include/nvkm/core/memory.h

View file

8

drivers/gpu/drm/nouveau/include/nvkm/core/mm.h

View file

5

drivers/gpu/drm/nouveau/include/nvkm/core/object.h

View file

2

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

View file

6

drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h

View file

76

drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h

View file

1

drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h

View file

26

drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/power_budget.h

View file

2

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

View file

3

drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h

View file

1

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

View file

1

drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h

View file

3

drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h

View file

17

drivers/gpu/drm/nouveau/include/nvkm/subdev/secboot.h

View file

6

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

View file

1

drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h

View file

6

drivers/gpu/drm/nouveau/nouveau_abi16.c

View file

24

drivers/gpu/drm/nouveau/nouveau_backlight.c

View file

18

drivers/gpu/drm/nouveau/nouveau_bios.c

View file

355

drivers/gpu/drm/nouveau/nouveau_bo.c

View file

4

drivers/gpu/drm/nouveau/nouveau_bo.h

View file

30

drivers/gpu/drm/nouveau/nouveau_chan.c

View file

5

drivers/gpu/drm/nouveau/nouveau_chan.h

View file

20

drivers/gpu/drm/nouveau/nouveau_connector.c

View file

5

drivers/gpu/drm/nouveau/nouveau_debugfs.c

View file

17

drivers/gpu/drm/nouveau/nouveau_display.c

View file

180

drivers/gpu/drm/nouveau/nouveau_drm.c

View file

8

drivers/gpu/drm/nouveau/nouveau_drv.h

View file

21

drivers/gpu/drm/nouveau/nouveau_fbcon.c

View file

2

drivers/gpu/drm/nouveau/nouveau_fence.c

View file

20

drivers/gpu/drm/nouveau/nouveau_gem.c

View file

2

drivers/gpu/drm/nouveau/nouveau_gem.h

View file

110

drivers/gpu/drm/nouveau/nouveau_hwmon.c

View file

7

drivers/gpu/drm/nouveau/nouveau_led.c

View file

24

drivers/gpu/drm/nouveau/nouveau_nvif.c

View file

3

drivers/gpu/drm/nouveau/nouveau_prime.c

View file

14

drivers/gpu/drm/nouveau/nouveau_sgdma.c

View file

76

drivers/gpu/drm/nouveau/nouveau_ttm.c

View file

2

drivers/gpu/drm/nouveau/nouveau_usif.c

View file

8

drivers/gpu/drm/nouveau/nouveau_vga.c

View file

2

drivers/gpu/drm/nouveau/nv04_fbcon.c

View file

8

drivers/gpu/drm/nouveau/nv17_fence.c

View file

34

drivers/gpu/drm/nouveau/nv50_display.c

View file

8

drivers/gpu/drm/nouveau/nv50_fence.c

View file

10

drivers/gpu/drm/nouveau/nv84_fence.c

View file

1

drivers/gpu/drm/nouveau/nvif/Kbuild

View file

49

drivers/gpu/drm/nouveau/nvif/client.c

View file

58

drivers/gpu/drm/nouveau/nvif/driver.c

View file

1

drivers/gpu/drm/nouveau/nvkm/Kbuild

View file

170

drivers/gpu/drm/nouveau/nvkm/core/client.c

View file

8

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

View file

78

drivers/gpu/drm/nouveau/nvkm/core/ioctl.c

View file

2

drivers/gpu/drm/nouveau/nvkm/core/mm.c

View file

64

drivers/gpu/drm/nouveau/nvkm/core/object.c

View file

3

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

View file

7

drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c

View file

7

drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c

View file

42

drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c

View file

19

drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c

View file

81

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

View file

8

drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c

View file

2

drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c

View file

10

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c

View file

266

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c

View file

19

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c

View file

3

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c

View file

7

drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h

View file

20

drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c

View file

12

drivers/gpu/drm/nouveau/nvkm/engine/gr/g84.c

View file

359

drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c

View file

3

drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h

View file

12

drivers/gpu/drm/nouveau/nvkm/engine/gr/gt200.c

View file

14

drivers/gpu/drm/nouveau/nvkm/engine/gr/gt215.c

View file

12

drivers/gpu/drm/nouveau/nvkm/engine/gr/mcp79.c

View file

14

drivers/gpu/drm/nouveau/nvkm/engine/gr/mcp89.c

View file

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