Hi Dave, More -misc stuff - moar drm_crtc.c split up&documentation - some fixes for the simple kms helpers (Andrea) - I included all the dri1 patches from David - we're not removing any code or drivers, and it seems to have worked as a wake-up call to motivate a few more people to upstream kms conversions for these. Feel free to revert if you disagree strongly. - a few other single patches
I'll be on vacation next 2 weeks, but there's nothing big outstanding in drm core afaikj, and Sean/Archit/Sumit and Thierry can take care of the small bits. I'll wrap it all up in a pull request when I'm back (well, probably when I'm at XDC already ...). Same for drm-intel, you'll get pull request for the final 4.9 feature piles when I'm back again. A bit later than usual, but still comfortably before the merge window opens I think. Otherwise I don't think anything needs to be done, but Jani's around in case of a real fire. Cheers, Daniel The following changes since commit 0d42204f374380b6334de7dd2fe7e7d795250290: drm/doc: Document uapi requirements in DRM (2016-08-24 07:13:08 +1000) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2016-08-31 for you to fetch changes up to 339fd36238dd3494bc4617d181e7a37922c29ee9: drm: drm_probe_helper: Fix output_poll_work scheduling (2016-08-31 13:23:30 +0200) ---------------------------------------------------------------- Andrea Merello (3): drm/bridge: introduce bridge detaching mechanism drm: simple_kms_helper: make connector optional at init time drm: simple_kms_helper: add support for bridges Arnd Bergmann (1): drm/fb-helper: don't call remove_conflicting_framebuffers for FB=m && DRM=y Daniel Vetter (11): drm/doc: Fix vga_switcheroo xref drm/simple-helpers: Always add planes to the state update drm: Extract drm_encoder.[hc] drm/doc: Polish kerneldoc for encoders drm: Extract drm_mode_object.[hc] drm: Remove drm_mode_object->atomic_count drm/doc: Polish docs for drm_mode_object drm: move drm_mode_legacy_fb_format to drm_fourcc.c drm: Extract drm_property.[hc] drm: Unify handling of blob and object properties drm/doc: Polish docs for drm_property&drm_property_blob David Herrmann (3): drm: hide legacy drivers with CONFIG_DRM_LEGACY drm: make DRI1 drivers depend on BROKEN drm: reduce GETCLIENT to a minimum Jose Abreu (1): drm: bridge/dw-hdmi: Fix colorspace and scan information registers values Liu Ying (3): drm/atomic-helper: Add atomic_disable CRTC helper callback drm/atomic-helper: Disable appropriate planes in disable_planes_on_crtc() drm/atomic-helper: Add NO_DISABLE_AFTER_MODESET flag support for plane commit Masahiro Yamada (1): drm/gma500: remove unnecessary config_enabled() guard Peter Ujfalusi (1): drm: drm_probe_helper: Fix output_poll_work scheduling Documentation/gpu/drm-kms.rst | 159 +-- Documentation/gpu/vga-switcheroo.rst | 2 + drivers/gpu/drm/Kconfig | 136 ++- drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/arm/malidp_drv.c | 3 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- drivers/gpu/drm/bridge/dw-hdmi.c | 7 +- drivers/gpu/drm/drm_atomic_helper.c | 61 +- drivers/gpu/drm/drm_bridge.c | 29 +- drivers/gpu/drm/drm_crtc.c | 1625 +------------------------- drivers/gpu/drm/drm_crtc_internal.h | 90 +- drivers/gpu/drm/drm_encoder.c | 232 ++++ drivers/gpu/drm/drm_fourcc.c | 43 + drivers/gpu/drm/drm_ioctl.c | 5 +- drivers/gpu/drm/drm_mode_object.c | 437 +++++++ drivers/gpu/drm/drm_probe_helper.c | 8 +- drivers/gpu/drm/drm_property.c | 899 ++++++++++++++ drivers/gpu/drm/drm_simple_kms_helper.c | 58 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- drivers/gpu/drm/gma500/opregion.c | 5 +- drivers/gpu/drm/imx/imx-drm-core.c | 3 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +- drivers/gpu/drm/msm/msm_atomic.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_kms.c | 3 +- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 +- drivers/gpu/drm/sti/sti_drv.c | 2 +- drivers/gpu/drm/tegra/drm.c | 3 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_kms.c | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 3 +- include/drm/drm_atomic_helper.h | 11 +- include/drm/drm_connector.h | 2 +- include/drm/drm_crtc.h | 262 +---- include/drm/drm_encoder.h | 227 ++++ include/drm/drm_fb_helper.h | 2 +- include/drm/drm_fourcc.h | 1 + include/drm/drm_framebuffer.h | 2 +- include/drm/drm_mode_object.h | 124 ++ include/drm/drm_modes.h | 2 +- include/drm/drm_modeset.h | 70 -- include/drm/drm_modeset_helper_vtables.h | 24 + include/drm/drm_property.h | 294 +++++ include/drm/drm_simple_kms_helper.h | 11 + 44 files changed, 2692 insertions(+), 2177 deletions(-) create mode 100644 drivers/gpu/drm/drm_encoder.c create mode 100644 drivers/gpu/drm/drm_mode_object.c create mode 100644 drivers/gpu/drm/drm_property.c create mode 100644 include/drm/drm_encoder.h create mode 100644 include/drm/drm_mode_object.h delete mode 100644 include/drm/drm_modeset.h create mode 100644 include/drm/drm_property.h -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx