Hi Dave, Here's the 2nd last pull for 4.12, everything landed after next week will punt to 4.13. drm-misc-next-2017-03-31: drm-misc for 4.12: Core: - Removed some fb subsampling dimension checks from core (Ville) - Some MST slot cleanup (Dhinakaran) - Extracted drm_debugfs.h & drm_ioctl.h from drmP.h (Daniel) - Added drm_atomic_helper_shutdown() to compliment suspend/resume counterparts (Daniel) - Pipe context through legacy modeset to remove legacy_backoff nasties (Daniel) - Cleanups around vblank as well as allowing lockless counter reads (Chris W.) - VGA Switcheroo added to MAINTAINERS with Lukas Wunner as reviewer (Lukas) Drivers: - Enhancements to rockchip driver probe (Jeffy) and dsi (Chris Z.) - Thunderbolt external GPU awareness added (Lukas) Cheers, D̶a̶n̶i̶e̶l̶(silly dim) Sean The following changes since commit 65d1086c44791112188f6aebbdc3a27cab3736d3: BackMerge tag 'v4.11-rc3' into drm-next (2017-03-23 12:05:13 +1000) are available in the git repository at: git://anongit.freedesktop.org/git/drm-misc tags/drm-misc-next-2017-03-31 for you to fetch changes up to b121b051d14cc6e4e799e96e9c06c55989f9e073: apple-gmux: Don't switch external DP port on 2011+ MacBook Pros (2017-03-30 22:42:30 +0200) ---------------------------------------------------------------- drm-misc for 4.12: Core: - Removed some fb subsampling dimension checks from core (Ville) - Some MST slot cleanup (Dhinakaran) - Extracted drm_debugfs.h & drm_ioctl.h from drmP.h (Daniel) - Added drm_atomic_helper_shutdown() to compliment suspend/resume counterparts (Daniel) - Pipe context through legacy modeset to remove legacy_backoff nasties (Daniel) - Cleanups around vblank as well as allowing lockless counter reads (Chris W.) - VGA Switcheroo added to MAINTAINERS with Lukas Wunner as reviewer (Lukas) Drivers: - Enhancements to rockchip driver probe (Jeffy) and dsi (Chris Z.) - Thunderbolt external GPU awareness added (Lukas) ---------------------------------------------------------------- Chris Wilson (6): drm: Make the decision to keep vblank irq enabled earlier drm: Mark up accesses of vblank->enabled outside of its spinlock drm: vblank cannot be enabled if dev->irq_enabled is false drm: Refactor vblank sequence number comparison drm: Peek at the current counter/timestamp for vblank queries drm: Convert cmpxchg(bool) back to a two step operation Chris Zhong (4): drm/rockchip/dsi: check phy_cfg_clk only for RK3399 dt-bindings: add the grf clock for dw-mipi-dsi drm/rockchip/dsi: enable the grf clk before writing grf registers drm/rockchip/dsi: correct the grf_switch_reg name Christopher Spinrath (1): drm/bridge: ti-tfp410: support hpd via gpio Daniel Vetter (31): drm/doc: Document feature merge deadlines Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux into drm-misc-next drm: drop extern from function decls drm: Extract drm_debugfs.h drm: document driver interface for CRC capturing drm/debugfs: Add kerneldoc drm/tilcdc: Drop calls to modeset_lock_crtc drm: Extract drm_ioctl.h drm/todo: Add tinydrm refactoring ideas drm/vblank: Remove DRM_VBLANKTIME_IN_VBLANK drm/atomic: Introduce drm_atomic_helper_shutdown drm/tegra: Don't use modeset_lock_crtc drm/doc: remove standard connector props from the csv file drm: Document kms locking a bit better drm: document the all the atomic iterators drm: Wire up proper acquire ctx for plane functions drm: Add acquire ctx parameter to ->update_plane drm: drm_plane_force_disable is not for atomic drivers drm: Add acquire ctx parameter to ->plane_disable drm/atomic-helper: remove backoff hack from disable/update_plane drm: Roll out acquire context for the page_flip ioctl drm: Add acquire ctx parameter to ->page_flip(_target) drm/atomic-helper: remove backoff hack from page_flip drm: simplify the locking in the GETCRTC ioctl drm: Restrict drm_mode_set_config_internal to non-atomic drivers drm: Add explicit acquire ctx handling around ->set_config drm: Add acquire ctx parameter to ->set_config drm/atomic-helper: Remove the backoff hack from set_config drm: Fixup failure paths in drm_atomic_helper_set_config drm: Clear e after kfree in drm_mode_page_flip_ioctl drm: Fix locking gotcha in page_flip ioctl Eric Anholt (1): drm: Clarify the role of plane_state argument to drm_simple update(). Gabriel Krisman Bertazi (1): drm: bochs: Prevent double-free of fb helper Jani Nikula (1): drm/scdc: declare drm_scdc_get_scrambling_status Javi Merino (1): drm: use .hword to represent 16-bit numbers Jeffy Chen (1): drm/rockchip: Refactor the component match logic. Lukas Wunner (6): MAINTAINERS: Add Lukas Wunner as reviewer for vga_switcheroo PCI: Recognize Thunderbolt devices drm/radeon: Don't register Thunderbolt eGPU with vga_switcheroo drm/amdgpu: Don't register Thunderbolt eGPU with vga_switcheroo drm/nouveau: Don't register Thunderbolt eGPU with vga_switcheroo apple-gmux: Don't switch external DP port on 2011+ MacBook Pros Maarten Lankhorst (1): Revert unrelated part of "drm: simplify the locking in the GETCRTC ioctl" Noralf Trønnes (1): drm/tinydrm: Fix drm_driver.fops.owner Pandiyan, Dhinakaran (3): drm/dp: Kill total_pbn and total_slots in struct drm_dp_mst_topology_mgr drm/dp: Kill unused MST vcpi slot availability tracking drm/dp: Split drm_dp_mst_allocate_vcpi Romain Perier (1): drm: dw_hdmi: Don't rely on the status of the bridge for updating HPD Shashank Sharma (1): drm: Add description for scdc variable Shawn Guo (1): drm: zte: remove leftover 'inf' from struct zx_hdmi Ville Syrjälä (3): drm: Share the code to compute color plane dimesions drm: Remove fb hsub/vsub alignment requirement drm: Add mode_config .get_format_info() hook Documentation/EDID/edid.S | 6 +- .../display/rockchip/dw_mipi_dsi_rockchip.txt | 2 +- Documentation/gpu/drm-uapi.rst | 12 ++ Documentation/gpu/introduction.rst | 25 +++ Documentation/gpu/kms-properties.csv | 5 - Documentation/gpu/todo.rst | 96 ++++++++++++ Documentation/process/index.rst | 1 + MAINTAINERS | 10 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 6 +- drivers/gpu/drm/armada/armada_crtc.c | 3 +- drivers/gpu/drm/armada/armada_overlay.c | 6 +- drivers/gpu/drm/bochs/bochs_fbdev.c | 4 +- drivers/gpu/drm/bochs/bochs_kms.c | 3 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- drivers/gpu/drm/bridge/ti-tfp410.c | 72 ++++++++- drivers/gpu/drm/drm_atomic_helper.c | 171 ++++++++------------- drivers/gpu/drm/drm_crtc.c | 73 ++++++--- drivers/gpu/drm/drm_crtc_helper.c | 4 +- drivers/gpu/drm/drm_debugfs.c | 56 ++----- drivers/gpu/drm/drm_debugfs_crc.c | 17 +- drivers/gpu/drm/drm_dp_mst_topology.c | 35 ++--- drivers/gpu/drm/drm_fb_cma_helper.c | 2 +- drivers/gpu/drm/drm_fourcc.c | 25 +++ drivers/gpu/drm/drm_framebuffer.c | 45 ++++-- drivers/gpu/drm/drm_internal.h | 2 +- drivers/gpu/drm/drm_ioctl.c | 1 + drivers/gpu/drm/drm_irq.c | 90 +++++++---- drivers/gpu/drm/drm_modeset_helper.c | 2 +- drivers/gpu/drm/drm_plane.c | 91 +++++++++-- drivers/gpu/drm/drm_plane_helper.c | 11 +- drivers/gpu/drm/drm_simple_kms_helper.c | 4 +- drivers/gpu/drm/gma500/gma_display.c | 7 +- drivers/gpu/drm/gma500/gma_display.h | 3 +- drivers/gpu/drm/i915/i915_drv.c | 20 +-- drivers/gpu/drm/i915/intel_display.c | 5 +- drivers/gpu/drm/i915/intel_dp_mst.c | 4 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 8 +- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 7 +- drivers/gpu/drm/nouveau/dispnv04/overlay.c | 18 ++- drivers/gpu/drm/nouveau/nouveau_display.c | 11 +- drivers/gpu/drm/nouveau/nouveau_display.h | 4 +- drivers/gpu/drm/nouveau/nouveau_vga.c | 10 +- drivers/gpu/drm/nouveau/nv50_display.c | 3 +- drivers/gpu/drm/radeon/radeon_device.c | 7 +- drivers/gpu/drm/radeon/radeon_display.c | 8 +- drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 +- drivers/gpu/drm/radeon/radeon_kms.c | 3 +- drivers/gpu/drm/rockchip/Kconfig | 10 +- drivers/gpu/drm/rockchip/Makefile | 16 +- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 9 +- drivers/gpu/drm/rockchip/cdn-dp-core.c | 8 +- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 50 ++++-- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 10 +- drivers/gpu/drm/rockchip/inno_hdmi.c | 10 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 141 +++++++++++------ drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 6 + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 8 +- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 3 +- drivers/gpu/drm/shmobile/shmob_drm_plane.c | 8 +- drivers/gpu/drm/tegra/dc.c | 8 +- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 12 +- drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 19 +-- drivers/gpu/drm/tinydrm/mi0283qt.c | 3 + drivers/gpu/drm/udl/udl_modeset.c | 3 +- drivers/gpu/drm/vc4/vc4_crtc.c | 5 +- drivers/gpu/drm/vc4/vc4_plane.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 6 +- drivers/gpu/drm/zte/zx_hdmi.c | 1 - drivers/pci/pci.h | 2 + drivers/pci/probe.c | 21 +++ drivers/platform/x86/apple-gmux.c | 31 +++- include/drm/drmP.h | 106 +------------ include/drm/drm_atomic.h | 159 ++++++++++++++++++- include/drm/drm_atomic_helper.h | 16 +- include/drm/drm_connector.h | 17 +- include/drm/drm_crtc.h | 28 +++- include/drm/drm_crtc_helper.h | 39 ++--- include/drm/drm_debugfs.h | 101 ++++++++++++ include/drm/drm_dp_mst_helper.h | 15 +- include/drm/drm_drv.h | 4 +- include/drm/drm_fourcc.h | 6 + include/drm/drm_global.h | 8 +- include/drm/drm_hashtab.h | 20 +-- include/drm/drm_ioctl.h | 102 ++++++++++++ include/drm/drm_mode_config.h | 154 +++++++++++++++---- include/drm/drm_of.h | 24 +-- include/drm/drm_pci.h | 22 +-- include/drm/drm_plane.h | 43 ++++-- include/drm/drm_plane_helper.h | 6 +- include/drm/drm_prime.h | 30 ++-- include/drm/drm_scdc_helper.h | 2 + include/drm/drm_simple_kms_helper.h | 2 +- include/drm/drm_sysfs.h | 4 +- include/drm/tinydrm/tinydrm.h | 4 +- include/linux/pci.h | 23 +++ 100 files changed, 1595 insertions(+), 767 deletions(-) create mode 100644 include/drm/drm_debugfs.h create mode 100644 include/drm/drm_ioctl.h -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel