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

Browse source

The main thing here is the addition of support for Volta GV100 GPUs,
everything else basically restructuring display / graphics init code
to make it possible to fit Volta support in more nicely.

There's a bunch of improvements/fixes scattered in there for earlier
GPUs too, particularly graphics engine init on all GPUs from Fermi
onwards.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv7sjDKyR43n+6=iLC+ExGhBTLRLdKqwrhcfJWjEAndK0g@mail.gmail.com

...

This commit is contained in:

Dave Airlie 2018-05-18 17:12:34 +10:00

parent 1fafef9dfe 6c46d01f25

commit 3b064e6f7b

333 changed files with 15678 additions and 8247 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

8

drivers/gpu/drm/nouveau/Kbuild

View file

51

drivers/gpu/drm/nouveau/dispnv50/Kbuild

View file

222

drivers/gpu/drm/nouveau/dispnv50/atom.h

View file

53

drivers/gpu/drm/nouveau/dispnv50/base.c

View file

31

drivers/gpu/drm/nouveau/dispnv50/base.h

View file

286

drivers/gpu/drm/nouveau/dispnv50/base507c.c

View file

71

drivers/gpu/drm/nouveau/dispnv50/base827c.c

View file

110

drivers/gpu/drm/nouveau/dispnv50/base907c.c

View file

48

drivers/gpu/drm/nouveau/dispnv50/base917c.c

View file

70

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

View file

50

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

View file

115

drivers/gpu/drm/nouveau/dispnv50/core507d.c

View file

35

drivers/gpu/drm/nouveau/nvkm/engine/disp/basegt200.c → drivers/gpu/drm/nouveau/dispnv50/core827d.c

View file

34

drivers/gpu/drm/nouveau/nvkm/engine/disp/basegk104.c → drivers/gpu/drm/nouveau/dispnv50/core907d.c

View file

34

drivers/gpu/drm/nouveau/nvkm/engine/disp/basegk110.c → drivers/gpu/drm/nouveau/dispnv50/core917d.c

View file

110

drivers/gpu/drm/nouveau/dispnv50/corec37d.c

View file

52

drivers/gpu/drm/nouveau/dispnv50/curs.c

View file

14

drivers/gpu/drm/nouveau/dispnv50/curs.h

View file

145

drivers/gpu/drm/nouveau/dispnv50/curs507a.c

View file

22

drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk110.c → drivers/gpu/drm/nouveau/dispnv50/curs907a.c

View file

50

drivers/gpu/drm/nouveau/dispnv50/cursc37a.c

View file

44

drivers/gpu/drm/nouveau/dispnv50/dac507d.c

View file

30

drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgt215.c → drivers/gpu/drm/nouveau/dispnv50/dac907d.c

View file

2238

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

View file

89

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

View file

511

drivers/gpu/drm/nouveau/dispnv50/head.c

View file

78

drivers/gpu/drm/nouveau/dispnv50/head.h

View file

325

drivers/gpu/drm/nouveau/dispnv50/head507d.c

View file

124

drivers/gpu/drm/nouveau/dispnv50/head827d.c

View file

284

drivers/gpu/drm/nouveau/dispnv50/head907d.c

View file

100

drivers/gpu/drm/nouveau/dispnv50/head917d.c

View file

212

drivers/gpu/drm/nouveau/dispnv50/headc37d.c

View file

95

drivers/gpu/drm/nouveau/dispnv50/lut.c

View file

15

drivers/gpu/drm/nouveau/dispnv50/lut.h

View file

51

drivers/gpu/drm/nouveau/dispnv50/oimm.c

View file

8

drivers/gpu/drm/nouveau/dispnv50/oimm.h

View file

52

drivers/gpu/drm/nouveau/dispnv50/oimm507b.c

View file

57

drivers/gpu/drm/nouveau/dispnv50/ovly.c

View file

30

drivers/gpu/drm/nouveau/dispnv50/ovly.h

View file

217

drivers/gpu/drm/nouveau/dispnv50/ovly507e.c

View file

107

drivers/gpu/drm/nouveau/dispnv50/ovly827e.c

View file

70

drivers/gpu/drm/nouveau/dispnv50/ovly907e.c

View file

45

drivers/gpu/drm/nouveau/dispnv50/ovly917e.c

View file

44

drivers/gpu/drm/nouveau/dispnv50/pior507d.c

View file

44

drivers/gpu/drm/nouveau/dispnv50/sor507d.c

View file

31

drivers/gpu/drm/nouveau/nvkm/engine/disp/basegt215.c → drivers/gpu/drm/nouveau/dispnv50/sor907d.c

View file

30

drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgk104.c → drivers/gpu/drm/nouveau/dispnv50/sorc37d.c

View file

47

drivers/gpu/drm/nouveau/dispnv50/wimm.c

View file

8

drivers/gpu/drm/nouveau/dispnv50/wimm.h

View file

86

drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c

View file

641

drivers/gpu/drm/nouveau/dispnv50/wndw.c

View file

96

drivers/gpu/drm/nouveau/dispnv50/wndw.h

View file

278

drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c

View file

47

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

View file

18

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

View file

14

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

View file

11

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

View file

13

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

View file

9

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

View file

12

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

View file

18

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

View file

2

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

View file

1

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

View file

16

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

View file

19

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

View file

13

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

View file

1

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

View file

2

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

View file

1

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

View file

1

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

View file

1

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

View file

3

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

View file

2

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

View file

4

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

View file

1

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

View file

33

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

View file

1

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

View file

3

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

View file

1

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

View file

36

drivers/gpu/drm/nouveau/nouveau_abi16.c

View file

2

drivers/gpu/drm/nouveau/nouveau_acpi.c

View file

2

drivers/gpu/drm/nouveau/nouveau_bo.c

View file

39

drivers/gpu/drm/nouveau/nouveau_chan.c

View file

1

drivers/gpu/drm/nouveau/nouveau_chan.h

View file

16

drivers/gpu/drm/nouveau/nouveau_connector.c

View file

35

drivers/gpu/drm/nouveau/nouveau_display.c

View file

3

drivers/gpu/drm/nouveau/nouveau_display.h

View file

15

drivers/gpu/drm/nouveau/nouveau_dma.c

View file

6

drivers/gpu/drm/nouveau/nouveau_dma.h

View file

90

drivers/gpu/drm/nouveau/nouveau_drm.c

View file

6

drivers/gpu/drm/nouveau/nouveau_drv.h

View file

3

drivers/gpu/drm/nouveau/nouveau_encoder.h

View file

11

drivers/gpu/drm/nouveau/nouveau_fence.c

View file

2

drivers/gpu/drm/nouveau/nouveau_fence.h

View file

50

drivers/gpu/drm/nouveau/nouveau_gem.c

View file

16

drivers/gpu/drm/nouveau/nouveau_hwmon.c

View file

1

drivers/gpu/drm/nouveau/nouveau_vmm.c

View file

2

drivers/gpu/drm/nouveau/nouveau_vmm.h

View file

2

drivers/gpu/drm/nouveau/nv04_fence.c

View file

2

drivers/gpu/drm/nouveau/nv10_fence.c

View file

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