Merge airlied/drm-next into drm-intel-next-queued

Browse source

Maarten needs both the new connector->atomic_check hook and the
connection_mutex locking changes in the probe helpers to be able to
start merging the connector property conversion to atomic.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

...

This commit is contained in:

Daniel Vetter 2017-04-12 10:07:43 +02:00

parent a8e9a419c3 d455937ed1

commit ebf3f19abb

1099 changed files with 423171 additions and 12119 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

1

.mailmap

View file

6

Documentation/EDID/edid.S

View file

6

Documentation/admin-guide/kernel-parameters.txt

View file

111

Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.txt

View file

75

Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt

View file

2

Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt

View file

2

Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt

View file

47

Documentation/devicetree/bindings/display/panel/mitsubishi,aa104xd12.txt

View file

47

Documentation/devicetree/bindings/display/panel/mitsubishi,aa121td01.txt

View file

91

Documentation/devicetree/bindings/display/panel/panel-common.txt

View file

3

Documentation/devicetree/bindings/display/panel/panel-dpi.txt

View file

120

Documentation/devicetree/bindings/display/panel/panel-lvds.txt

View file

3

Documentation/devicetree/bindings/display/renesas,du.txt

View file

7

Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt

View file

3

Documentation/devicetree/bindings/rng/omap_rng.txt

View file

3

Documentation/filesystems/Locking

View file

6

Documentation/filesystems/porting

View file

3

Documentation/filesystems/vfs.txt

View file

15

Documentation/gpu/bridge/dw-hdmi.rst

View file

50

Documentation/gpu/drm-internals.rst

View file

36

Documentation/gpu/drm-uapi.rst

View file

2

Documentation/gpu/index.rst

View file

25

Documentation/gpu/introduction.rst

View file

5

Documentation/gpu/kms-properties.csv

View file

1 Owner Module/Drivers Group Property Name Type Property Values Object attached Description/Restrictions 2 “scaling mode” ENUM { "None", "Full", "Center", "Full aspect" } Connector Supported by: amdgpu, gma500, i915, nouveau and radeon. Connector “EDID” BLOB | IMMUTABLE 0 Connector Contains id of edid blob ptr object. “DPMS” ENUM { “On”, “Standby”, “Suspend”, “Off” } Connector Contains DPMS operation mode value. “PATH” BLOB | IMMUTABLE 0 Connector Contains topology path to a connector. “TILE” BLOB | IMMUTABLE 0 Connector Contains tiling information for a connector. “CRTC_ID” OBJECT DRM_MODE_OBJECT_CRTC Connector CRTC that connector is attached to (atomic) 3 DVI-I “subconnector” ENUM { “Unknown”, “DVI-D”, “DVI-A” } Connector TBD 4 “select subconnector” ENUM { “Automatic”, “DVI-D”, “DVI-A” } Connector TBD 5 TV “subconnector” ENUM { "Unknown", "Composite", "SVIDEO", "Component", "SCART" } Connector TBD

61

Documentation/gpu/meson.rst

View file

127

Documentation/gpu/todo.rst

View file

960

Documentation/media/uapi/v4l/subdev-formats.rst

View file

8

Documentation/pinctrl.txt

View file

1

Documentation/process/index.rst

View file

2

Documentation/process/stable-kernel-rules.rst

View file

63

Documentation/virtual/kvm/api.txt

View file

6

Documentation/virtual/kvm/devices/arm-vgic.txt

View file

38

MAINTAINERS

View file

16

Makefile

View file

2

arch/alpha/kernel/osf_sys.c

View file

1

arch/arc/boot/dts/skeleton.dtsi

View file

1

arch/arc/boot/dts/skeleton_hs.dtsi

View file

21

arch/arc/boot/dts/skeleton_hs_idu.dtsi

View file

20

arch/arc/boot/dts/vdk_axs10x_mb.dtsi

View file

4

arch/arc/include/asm/kprobes.h

View file

12

arch/arc/kernel/entry-arcv2.S

View file

16

arch/arc/kernel/setup.c

View file

3

arch/arc/mm/cache.c

View file

4

arch/arm/boot/dts/sun8i-a33.dtsi

View file

3

arch/arm/kvm/arm.c

View file

23

arch/arm/kvm/mmu.c

View file

20

arch/arm/mm/dma-mapping.c

View file

5

arch/arm/mm/nommu.c

View file

61

arch/arm/probes/kprobes/core.c

View file

11

arch/arm/probes/kprobes/test-core.c

View file

2

arch/arm64/include/asm/current.h

View file

2

arch/arm64/kernel/smp.c

View file

1

arch/arm64/kernel/vdso/.gitignore vendored

View file

42

arch/arm64/mm/fault.c

View file

14

arch/arm64/mm/hugetlbpage.c

View file

41

arch/c6x/kernel/ptrace.c

View file

8

arch/h8300/kernel/ptrace.c

View file

14

arch/m68k/configs/amiga_defconfig

View file

14

arch/m68k/configs/apollo_defconfig

View file

14

arch/m68k/configs/atari_defconfig

View file

14

arch/m68k/configs/bvme6000_defconfig

View file

14

arch/m68k/configs/hp300_defconfig

View file

14

arch/m68k/configs/mac_defconfig

View file

14

arch/m68k/configs/multi_defconfig

View file

14

arch/m68k/configs/mvme147_defconfig

View file

14

arch/m68k/configs/mvme16x_defconfig

View file

14

arch/m68k/configs/q40_defconfig

View file

14

arch/m68k/configs/sun3_defconfig

View file

14

arch/m68k/configs/sun3x_defconfig

View file

2

arch/m68k/include/asm/bitops.h

View file

2

arch/m68k/include/asm/unistd.h

View file

1

arch/m68k/include/uapi/asm/unistd.h

View file

1

arch/m68k/kernel/syscalltable.S

View file

15

arch/metag/include/asm/uaccess.h

View file

19

arch/metag/kernel/ptrace.c

View file

324

arch/metag/lib/usercopy.c

View file

2

arch/mips/Kconfig

View file

1

arch/mips/include/asm/fpu.h

View file

15

arch/mips/include/asm/irq.h

View file

8

arch/mips/include/asm/spinlock.h

View file

15

arch/mips/include/uapi/asm/unistd.h

View file

1

arch/mips/kernel/asm-offsets.c

View file

2

arch/mips/kernel/cps-vec.S

View file

2

arch/mips/kernel/cpu-probe.c

View file

12

arch/mips/kernel/genex.S

View file

56

arch/mips/kernel/process.c

View file

3

arch/mips/kernel/ptrace.c

View file

1

arch/mips/kernel/scall32-o32.S

View file

1

arch/mips/kernel/scall64-64.S

View file

1

arch/mips/kernel/scall64-n32.S

View file

1

arch/mips/kernel/scall64-o32.S

View file

17

arch/mips/kernel/traps.c

View file

2

arch/mips/lantiq/xway/sysctrl.c

View file

2

arch/mips/mm/c-r4k.c

View file

25

arch/mips/mm/tlbex.c

View file

4

arch/mips/ralink/rt3883.c

View file

7

arch/nios2/kernel/prom.c

View file

3

arch/nios2/kernel/setup.c

View file

59

arch/parisc/include/asm/uaccess.h

View file

10

arch/parisc/kernel/parisc_ksyms.c

View file

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