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

Browse source

- Initial atomic modesetting support.  Used for "legacy" KMS interfaces,
ioctl not exposed by default, but there is a commandline option to
enable it.
- Initial DP 1.2 MST support
- Misc other code cleanups + fixes

* 'linux-4.10' of git://github.com/skeggsb/linux: (64 commits)
  drm/nouveau/fifo/gf100-: protect channel preempt with subdev mutex
  drm/nouveau/gr: fallback to legacy paths during firmware lookup
  drm/nouveau/kms/nv50: initial support for DP 1.2 multi-stream
  drm/nouveau/kms/nv50: allow encoder update to be called from other modules
  drm/nouveau/kms/nv50: rename remaining nv50_crtc to nv50_head
  drm/nouveau/kms/nv50: remove code to create ctxdma for every framebuffer
  drm/nouveau/kms/nv50: remove code to support non-atomic page flips
  drm/nouveau/kms/nv50: remove code to support non-atomic connector properties
  drm/nouveau/kms/nv50: remove code to support non-atomic dpms
  drm/nouveau/kms/nv50: remove code to support non-atomic modesets
  drm/nouveau/kms/nv50: transition to atomic interfaces internally
  drm/nouveau/kms/nv50: turn mode_set_base_atomic() into a stub
  drm/nouveau/kms/nv50: convert encoder mode_fixup into an atomic_check()
  drm/nouveau/kms/nv50: clean-up encoder functions
  drm/nouveau/kms/nv50: ensure encoder normal power state is enabled at startup
  drm/nouveau/kms/nv50: prepare ctxdma interface to be usable with atomic
  drm/nouveau/kms/nv50: separate out cursor channel commit
  drm/nouveau/kms/nv50: separate out base channel commit
  drm/nouveau/kms/nv50: separate out vblank dmi commit
  drm/nouveau/kms/nv50: separate out procamp commit
  ...

...

This commit is contained in:

Dave Airlie 2016-11-07 14:20:43 +10:00

parent 7b624ad8fe b27add13f5

commit afdd548f74

104 changed files with 4430 additions and 2165 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

2

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

View file

17

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

View file

29

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

View file

3

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

View file

3

drivers/gpu/drm/nouveau/nouveau_bios.c

View file

660

drivers/gpu/drm/nouveau/nouveau_connector.c

View file

98

drivers/gpu/drm/nouveau/nouveau_connector.h

View file

7

drivers/gpu/drm/nouveau/nouveau_crtc.h

View file

276

drivers/gpu/drm/nouveau/nouveau_display.c

View file

15

drivers/gpu/drm/nouveau/nouveau_display.h

View file

19

drivers/gpu/drm/nouveau/nouveau_dp.c

View file

3

drivers/gpu/drm/nouveau/nouveau_drm.c

View file

4

drivers/gpu/drm/nouveau/nouveau_drv.h

View file

14

drivers/gpu/drm/nouveau/nouveau_encoder.h

View file

81

drivers/gpu/drm/nouveau/nouveau_fbcon.c

View file

2

drivers/gpu/drm/nouveau/nouveau_fbcon.h

View file

2

drivers/gpu/drm/nouveau/nouveau_fence.c

View file

2

drivers/gpu/drm/nouveau/nouveau_fence.h

View file

2

drivers/gpu/drm/nouveau/nouveau_gem.c

View file

8

drivers/gpu/drm/nouveau/nv04_fbcon.c

View file

5

drivers/gpu/drm/nouveau/nv10_fence.c

View file

1

drivers/gpu/drm/nouveau/nv10_fence.h

View file

4412

drivers/gpu/drm/nouveau/nv50_display.c

View file

File diff suppressed because it is too large Load diff

7

drivers/gpu/drm/nouveau/nv50_display.h

View file

10

drivers/gpu/drm/nouveau/nv50_fbcon.c

View file

20

drivers/gpu/drm/nouveau/nv50_fence.c

View file

22

drivers/gpu/drm/nouveau/nv84_fence.c

View file

10

drivers/gpu/drm/nouveau/nvc0_fbcon.c

View file

2

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

View file

6

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

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h

View file

8

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

View file

2

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

View file

2

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

View file

8

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

View file

6

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

View file

2

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

View file

9

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

View file

4

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

View file

25

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

View file

3

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

View file

33

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

View file

9

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

View file

47

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

View file

16

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

View file

1

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

View file

1

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

View file

4

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

View file

9

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

View file

8

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

View file

2

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

View file

2

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

View file

1

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

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h

View file

54

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

View file

4

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

View file

2

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

View file

4

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

View file

2

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

View file

4

drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h

View file

4

drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c

View file

1

drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h

View file

7

drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c

View file

1

drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowacpi.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c

View file

1

drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild

View file

4

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

View file

20

drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c

View file

40

drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm20b.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c

View file

8

drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c

View file

1

drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr2.c

View file

1

drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr3.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/gpio/gk104.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c

View file

10

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c

View file

10

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c

View file

3

drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c

View file

4

drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/mc/g84.c

View file

4

drivers/gpu/drm/nouveau/nvkm/subdev/mxm/base.c

View file

4

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h

View file

4

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h

View file

4

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h

View file

4

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h

View file

9

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c

View file

2

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

View file

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