Hi Dave, Seems I lied in my last drm-misc pull request and suddenly there's a big pile of random stuff. Boris dug out Thierry's drm-trivial branch and resubmitted everything since that branch didn't really work out. On top of that Nicolas' changes to drm_dev_set_unique - this might conflict with new driver pulls (I double checked and current drm-next should be fine), so please beware. The -next/-fixes conflict in vmwgfx will change slightly with this here too. For 4.5 there's one final drm-intel pull early next week and them I'm off on vacation for a few days. Cheers, Daniel The following changes since commit 51bce5bc38bdb79c0f7ab33f1fe91a68ef1afa77: Merge tag 'drm-intel-next-2015-12-04-1' of git://anongit.freedesktop.org/drm-intel into drm-next (2015-12-15 11:01:04 +1000) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2015-12-18 for you to fetch changes up to e112e593b215c394c0303dbf0534db0928e87967: drm: use dev_name as default unique name in drm_dev_alloc() (2015-12-15 13:56:06 +0100) ---------------------------------------------------------------- Daniel Vetter (2): drm/atomic-helper: Drop unneeded argument from check_pending_encoder drm: Move more framebuffer doc from docbook to kerneldoc Danilo Cesar Lemes de Paula (1): drm/doc: Convert to markdown Eric Anholt (1): drm: Use the driver's gem_object_free function from CMA helpers. Frediano Ziglio (1): drm/qxl: use to_qxl_bo macro Harry Wentland (1): drm/dp/mst: save vcpi with payloads Luis de Bethencourt (1): drm: atmel-hlcdc: Fix module autoload for OF platform driver Mykola Lysenko (1): drm/dp/mst: reply with ACK for UP reqs Nicolas Ferre (1): drm: atmel-hlcdc: add support for sama5d2 SoCs Nicolas Iooss (2): drm: make drm_dev_set_unique() not use a format string drm: use dev_name as default unique name in drm_dev_alloc() Rasmus Villemoes (3): drm/omap: use kzalloc in sita_init() drm/vmwgfx: use kzalloc in vmw_surface_define_ioctl() drm/vmwgfx: check kmalloc return value Thierry Reding (4): drm/gma500: Sanity-check pipe index drm/bochs: Store correct CRTC index in events drm/imx: Make pipe number unsigned drm/imx: Drop pipe field from struct imx_drm_crtc Ville Syrjälä (18): drm: Constify drm_encoder_slave_funcs drm/armada: Constify function pointer structs drm/atmel-hlcdc: Constify function pointer structs drm/bochs: Constify function pointer structs drm/bridge/dw_hdmi: Constify function pointer structs drm/bridge/nxp-ptn3460: Constify function pointer structs drm/i2c/ch7006: Constify function pointer structs drm/cirrus: Constify function pointer structs drm/exynos: Constify function pointer structs drm/i2c/adv7511: Constify function pointer structs drm/i2c/sil164: Constify function pointer structs drm/imx: Constify function pointer structs drm/mgag200: Constify function pointer structs drm/nouveau: Constify function pointer structs drm/rockchip: Constify function pointer structs drm/tegra: Constify function pointer structs drm/udl: Constify function pointer structs drm/vmwgfx: Constify function pointer structs Documentation/DocBook/gpu.tmpl | 158 +---------------------- drivers/gpu/drm/armada/armada_crtc.c | 2 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 9 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 4 +- drivers/gpu/drm/bochs/bochs_kms.c | 8 +- drivers/gpu/drm/bridge/dw_hdmi.c | 6 +- drivers/gpu/drm/bridge/nxp-ptn3460.c | 6 +- drivers/gpu/drm/cirrus/cirrus_mode.c | 4 +- drivers/gpu/drm/drm_atomic_helper.c | 5 +- drivers/gpu/drm/drm_dp_mst_topology.c | 4 +- drivers/gpu/drm/drm_drv.c | 26 ++-- drivers/gpu/drm/drm_encoder_slave.c | 2 +- drivers/gpu/drm/drm_fb_cma_helper.c | 6 +- drivers/gpu/drm/drm_gem_cma_helper.c | 4 +- drivers/gpu/drm/drm_modes.c | 12 +- drivers/gpu/drm/drm_modeset_lock.c | 14 +- drivers/gpu/drm/drm_prime.c | 16 +-- drivers/gpu/drm/exynos/exynos_dp_core.c | 8 +- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 8 +- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 8 +- drivers/gpu/drm/exynos/exynos_drm_fb.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_mic.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 8 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 1 - drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 10 +- drivers/gpu/drm/i2c/adv7511.c | 2 +- drivers/gpu/drm/i2c/ch7006_drv.c | 2 +- drivers/gpu/drm/i2c/sil164_drv.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 48 +++---- drivers/gpu/drm/imx/dw_hdmi-imx.c | 4 +- drivers/gpu/drm/imx/imx-drm-core.c | 23 ++-- drivers/gpu/drm/imx/imx-drm.h | 2 +- drivers/gpu/drm/imx/imx-ldb.c | 8 +- drivers/gpu/drm/imx/imx-tve.c | 8 +- drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- drivers/gpu/drm/imx/parallel-display.c | 8 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 4 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 4 - drivers/gpu/drm/nouveau/nouveau_encoder.h | 2 +- drivers/gpu/drm/omapdrm/tcm-sita.c | 7 +- drivers/gpu/drm/qxl/qxl_object.c | 2 +- drivers/gpu/drm/qxl/qxl_ttm.c | 4 +- drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 6 +- drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 8 +- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 4 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 - drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +- drivers/gpu/drm/tegra/drm.c | 1 - drivers/gpu/drm/tegra/fb.c | 2 +- drivers/gpu/drm/udl/udl_connector.c | 4 +- drivers/gpu/drm/udl/udl_modeset.c | 2 +- drivers/gpu/drm/vc4/vc4_drv.c | 2 - drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 9 +- include/drm/drmP.h | 2 +- include/drm/drm_crtc.h | 18 ++- include/drm/drm_encoder_slave.h | 2 +- 63 files changed, 208 insertions(+), 363 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx