Merge drm-next into drm-intel-next-queued

Browse source

To pull in the HDCP changes, especially wait_for changes to drm/i915
that Chris wants to build on top of.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

...

This commit is contained in:

Joonas Lahtinen 2018-02-28 12:12:03 +02:00

parent 73c0fcac97 b8a89f530f

commit f074037a2e

56 changed files with 2805 additions and 1505 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/dma-buf/reservation.c

View file

1

drivers/gpu/drm/ast/ast_mode.c

View file

6

drivers/gpu/drm/drm_auth.c

View file

1

drivers/gpu/drm/i915/gvt/dmabuf.c

View file

24

drivers/gpu/drm/i915/gvt/gtt.c

View file

3

drivers/gpu/drm/i915/gvt/handlers.c

View file

1

drivers/gpu/drm/i915/gvt/hypercall.h

View file

16

drivers/gpu/drm/i915/gvt/kvmgt.c

View file

10

drivers/gpu/drm/i915/gvt/mmio_context.c

View file

17

drivers/gpu/drm/i915/gvt/mpt.h

View file

7

drivers/gpu/drm/i915/gvt/sched_policy.c

View file

2

drivers/gpu/drm/i915/gvt/vgpu.c

View file

1

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

View file

1

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

View file

17

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

View file

28

drivers/gpu/drm/nouveau/nouveau_bo.h

View file

1

drivers/gpu/drm/nouveau/nouveau_crtc.h

View file

22

drivers/gpu/drm/nouveau/nouveau_fbcon.c

View file

189

drivers/gpu/drm/nouveau/nv50_display.c

View file

30

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

View file

1

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

View file

207

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

View file

55

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

View file

155

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

View file

6

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

View file

1

drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.c

View file

9

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

View file

1

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

View file

6

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

View file

47

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

View file

35

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

View file

71

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

View file

2

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

View file

3

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c

View file

778

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

View file

854

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

View file

1016

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

View file

30

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/memx.fuc

View file

2

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

View file

1

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

View file

144

drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r370.c

View file

49

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

View file

93

drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r375.c

View file

2

drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c

View file

67

drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp108.c

View file

2

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

View file

2

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

View file

70

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

View file

58

drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf100.c

View file

35

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

View file

8

drivers/gpu/drm/nouveau/nvkm/subdev/therm/gf119.c

View file

136

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

View file

48

drivers/gpu/drm/nouveau/nvkm/subdev/therm/gk104.h

View file

2

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

View file

21

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

View file