Merge tag 'drm-misc-next-2017-07-26' of git://anongit.freedesktop.org/git/drm-misc into drm-next

Browse source

drm-misc-next-2017-07-18:
Core Changes:
- A couple fixes to only opening crc when needed (Maarten)
- Change atomic helper swap_state to be interruptible (Maarten)
- fb_helper: Support waiting for an output before setting up (Daniel)
- Allow drivers supporting runtime_pm to use helper_commit_tail (Maxime)

Driver Changes:
- misc: Use %pOF to print device node names (Rob)
- Miscellaneous fixes

drm-misc-next-2017-07-18:
UAPI Changes:
- Fail commits which request an event without including a crtc (Andrey)

Core Changes:
- Add YCBCR 4:2:0 support (Shashank)
- s/drm_atomic_replace_property_blob/drm_property_replace_blob/ (Peter)
- Add proper base class for private objs instead of using void* (Ville)
- Remove pending_read/write_domains from drm_gem_object (Chris)
- Add async plane update support (ie: cursor) to atomic helpers (Gustavo)
- Add old state to .enable and rename to .atomic_enable (Laurent)
- Add drm_atomic_helper_wait_for_flip_done() (Boris)
- Remove drm_driver->set_busid hook (Daniel)
- Migrate vblank documentation into the source files (Daniel)
- Add fb_helper->lock instead of abusing modeset lock (Thierry/Daniel)

Driver Changes:
- stm: Add STM32 DSI controller driver (Phillipe)
- amdgpu: Numerous small/misc fixes
- bridge: Add Synopsys Designware MIPI DSI host bridge driver (Phillipe)
- tinydrm: Add support for Pervasive Displays RePaper displays (Noralf)
- misc: Replace for_each_[obj]_in_state to prep for removal (Maarten)
- misc: Use .atomic_disable for atomic drivers (Laurent)
- vgem: Pin pages when mapped/exported (Chris)
- dw_hdmi: Add support for Rockchip RK3399 (Mark)
- atmel-hlcdc: Add 8-bit color look-up table format (Peter)
- vc4: Send vblank event when disabling a crtc (Boris)
- vc4: Use atomic helpers for fence waits (Eric)
- misc: drop drm_vblank_cleanup cargo-cult (Daniel)

Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Peter Rosin <peda@axentia.se>
Cc: Mark Yao <mark.yao@rock-chips.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Cc: Gustavo Padovan <gustavo.padovan@collabora.com>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Peter Rosin <peda@axentia.se>
Cc: Shashank Sharma <shashank.sharma@intel.com>
Cc: Philippe CORNU <philippe.cornu@st.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>

* tag 'drm-misc-next-2017-07-26' of git://anongit.freedesktop.org/git/drm-misc: (171 commits)
  drm/hisilicon: fix build error without fbdev emulation
  drm/atomic: implement drm_atomic_helper_commit_tail for runtime_pm users
  drm: Improve kerneldoc for drm_modeset_lock
  drm/hisilicon: Remove custom FB helper deferred setup
  drm/exynos: Remove custom FB helper deferred setup
  drm/fb-helper: Support deferred setup
  dma-fence: Don't BUG_ON when not absolutely needed
  drm: Convert to using %pOF instead of full_name
  drm/syncobj: Fix kerneldoc
  drm/atomic: Allow drm_atomic_helper_swap_state to fail
  drm/atomic: Add __must_check to drm_atomic_helper_swap_state.
  drm/vc4: Handle drm_atomic_helper_swap_state failure
  drm/tilcdc: Handle drm_atomic_helper_swap_state failure
  drm/tegra: Handle drm_atomic_helper_swap_state failure
  drm/msm: Handle drm_atomic_helper_swap_state failure
  drm/mediatek: Handle drm_atomic_helper_swap_state failure
  drm/i915: Handle drm_atomic_helper_swap_state failure
  drm/atmel-hlcdc: Handle drm_atomic_helper_swap_state failure
  drm/nouveau: Handle drm_atomic_helper_swap_state failure
  drm/atomic: Change drm_atomic_helper_swap_state to return an error.
  ...

...

This commit is contained in:

Dave Airlie 2017-07-27 05:32:45 +10:00

parent 2d62c799f8 8bb9777332

commit 542aefb5a2

228 changed files with 5152 additions and 1811 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

32

Documentation/devicetree/bindings/display/bridge/dw_mipi_dsi.txt

View file

52

Documentation/devicetree/bindings/display/repaper.txt

View file

7

Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt

View file

1

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

2

Documentation/gpu/drm-internals.rst

View file

59

Documentation/gpu/drm-kms.rst

View file

4

Documentation/gpu/drm-mm.rst

View file

2

Documentation/gpu/drm-uapi.rst

View file

6

MAINTAINERS

View file

4

drivers/dma-buf/dma-fence.c

View file

107

drivers/dma-buf/sw_sync.c

View file

19

drivers/dma-buf/sync_debug.c

View file

26

drivers/dma-buf/sync_debug.h

View file

1

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

View file

1

drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c

View file

1

drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c

View file

2

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

View file

2

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

View file

2

drivers/gpu/drm/amd/amdgpu/dce_v6_0.c

View file

2

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

View file

41

drivers/gpu/drm/arc/arcpgu_crtc.c

View file

10

drivers/gpu/drm/arm/hdlcd_crtc.c

View file

2

drivers/gpu/drm/arm/hdlcd_drv.c

View file

10

drivers/gpu/drm/arm/malidp_crtc.c

View file

2

drivers/gpu/drm/arm/malidp_drv.c

View file

9

drivers/gpu/drm/armada/armada_crtc.c

View file

4

drivers/gpu/drm/armada/armada_drv.c

View file

1

drivers/gpu/drm/armada/armada_fbdev.c

View file

2

drivers/gpu/drm/armada/armada_overlay.c

View file

5

drivers/gpu/drm/ast/ast_drv.c

View file

1

drivers/gpu/drm/ast/ast_fb.c

View file

18

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

View file

30

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c

View file

16

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h

View file

29

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

View file

5

drivers/gpu/drm/bochs/bochs_drv.c

View file

7

drivers/gpu/drm/bochs/bochs_fbdev.c

View file

6

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

View file

9

drivers/gpu/drm/bridge/analogix-anx78xx.c

View file

9

drivers/gpu/drm/bridge/dumb-vga-dac.c

View file

6

drivers/gpu/drm/bridge/nxp-ptn3460.c

View file

5

drivers/gpu/drm/bridge/panel.c

View file

6

drivers/gpu/drm/bridge/parade-ps8622.c

View file

8

drivers/gpu/drm/bridge/sii902x.c

View file

6

drivers/gpu/drm/bridge/synopsys/Kconfig

View file

2

drivers/gpu/drm/bridge/synopsys/Makefile

View file

9

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c

View file

981

drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c

View file

6

drivers/gpu/drm/bridge/tc358767.c

View file

6

drivers/gpu/drm/bridge/ti-tfp410.c

View file

5

drivers/gpu/drm/cirrus/cirrus_drv.c

View file

1

drivers/gpu/drm/cirrus/cirrus_fbdev.c

View file

121

drivers/gpu/drm/drm_atomic.c

View file

345

drivers/gpu/drm/drm_atomic_helper.c

View file

3

drivers/gpu/drm/drm_color_mgmt.c

View file

61

drivers/gpu/drm/drm_debugfs_crc.c

View file

89

drivers/gpu/drm/drm_dp_mst_topology.c

View file

16

drivers/gpu/drm/drm_drv.c

View file

440

drivers/gpu/drm/drm_edid.c

View file

4

drivers/gpu/drm/drm_fb_cma_helper.c

View file

636

drivers/gpu/drm/drm_fb_helper.c

View file

7

drivers/gpu/drm/drm_file.c

View file

2

drivers/gpu/drm/drm_framebuffer.c

View file

10

drivers/gpu/drm/drm_gem.c

View file

2

drivers/gpu/drm/drm_gem_cma_helper.c

View file

14

drivers/gpu/drm/drm_internal.h

View file

2

drivers/gpu/drm/drm_ioc32.c

View file

13

drivers/gpu/drm/drm_ioctl.c

View file

6

drivers/gpu/drm/drm_mipi_dsi.c

View file

91

drivers/gpu/drm/drm_modes.c

View file

12

drivers/gpu/drm/drm_modeset_lock.c

View file

4

drivers/gpu/drm/drm_of.c

View file

40

drivers/gpu/drm/drm_pci.c

View file

4

drivers/gpu/drm/drm_probe_helper.c

View file

23

drivers/gpu/drm/drm_property.c

View file

20

drivers/gpu/drm/drm_simple_kms_helper.c

View file

2

drivers/gpu/drm/drm_syncobj.c

View file

187

drivers/gpu/drm/drm_vblank.c

View file

10

drivers/gpu/drm/exynos/exynos_drm_crtc.c

View file

6

drivers/gpu/drm/exynos/exynos_drm_drv.c

View file

3

drivers/gpu/drm/exynos/exynos_drm_dsi.c

View file

27

drivers/gpu/drm/exynos/exynos_drm_fb.c

View file

26

drivers/gpu/drm/exynos/exynos_drm_fbdev.c

View file

2

drivers/gpu/drm/exynos/exynos_hdmi.c

View file

5

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c

View file

4

drivers/gpu/drm/gma500/mdfld_intel_display.c

View file

5

drivers/gpu/drm/gma500/psb_drv.c

View file

10

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c

View file

3

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c

View file

1

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c

View file

13

drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c

View file

28

drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c

View file

2

drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h

View file

2

drivers/gpu/drm/i2c/tda998x_drv.c

View file

5

drivers/gpu/drm/i810/i810_drv.c

View file

7

drivers/gpu/drm/i915/i915_drv.c

View file

2

drivers/gpu/drm/i915/i915_drv.h

View file

2

drivers/gpu/drm/i915/i915_irq.c

View file

12

drivers/gpu/drm/i915/intel_display.c

View file

47

drivers/gpu/drm/i915/intel_dp_mst.c

View file

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