Hi Dave, Ok as promised heres the patches to do some function interface refactoring across the tree. I've double check and run gcc on x86 and arm, but please also check that nothing crept in meanwhile before pushing out the merge. Otherwise a few more misc patches, plus the 2 duct-tape patches for dp mst backporting from Lyude. Note that I spotted one tegra patch in-flight which will conflict, I asked for that to be rebased already. Cheers, Daniel The following changes since commit 99ee87295017e36abb6925e6139ca303cb55aee7: Merge tag 'topic/drm-misc-2016-05-13' of git://anongit.freedesktop.org/drm-intel into drm-next (2016-05-17 07:06:14 +1000) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2016-05-17 for you to fetch changes up to 255f0e7c418ad95a4baeda017ae6182ba9b3c423: drm/fb_helper: Fix references to dev->mode_config.num_connector (2016-05-17 15:44:41 +0200) ---------------------------------------------------------------- Chris Wilson (1): drm: Remove unused drm_device from drm_gem_object_lookup() Dan Carpenter (1): drm/exynos/hdmi: add a missing tab Daniel Vetter (3): drm: Drop crtc argument from __drm_atomic_helper_crtc_destroy_state drm: Drop plane argument from __drm_atomic_helper_plane_destroy_state drm: Drop connector argument from __drm_atomic_helper_connector_destroy_state Gerd Hoffmann (1): qxl: catch qxlfb_create_pinned_object failures Lyude (2): drm/i915/fbdev: Fix num_connector references in intel_fb_initial_config() drm/fb_helper: Fix references to dev->mode_config.num_connector Noralf Trønnes (2): drm/fb-cma-helper: Use const for drm_framebuffer_funcs argument drm/fb-cma-helper: Add function drm_fb_cma_create_with_funcs() drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +++---- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- drivers/gpu/drm/armada/armada_crtc.c | 2 +- drivers/gpu/drm/armada/armada_fb.c | 2 +- drivers/gpu/drm/armada/armada_gem.c | 6 ++--- drivers/gpu/drm/armada/armada_gem.h | 4 +-- drivers/gpu/drm/ast/ast_main.c | 4 +-- drivers/gpu/drm/ast/ast_mode.c | 2 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 2 +- drivers/gpu/drm/bochs/bochs_mm.c | 4 +-- drivers/gpu/drm/cirrus/cirrus_main.c | 4 +-- drivers/gpu/drm/drm_atomic_helper.c | 25 +++++++---------- drivers/gpu/drm/drm_fb_cma_helper.c | 37 +++++++++++++++++++------- drivers/gpu/drm/drm_fb_helper.c | 5 ++-- drivers/gpu/drm/drm_gem.c | 14 +++------- drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- drivers/gpu/drm/drm_prime.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 +++--- drivers/gpu/drm/exynos/exynos_drm_fb.c | 3 +-- drivers/gpu/drm/exynos/exynos_drm_gem.c | 10 +++---- drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- drivers/gpu/drm/gma500/framebuffer.c | 2 +- drivers/gpu/drm/gma500/gem.c | 2 +- drivers/gpu/drm/gma500/gma_display.c | 2 +- drivers/gpu/drm/i915/i915_gem.c | 22 +++++++-------- drivers/gpu/drm/i915/i915_gem_tiling.c | 4 +-- drivers/gpu/drm/i915/intel_display.c | 7 +++-- drivers/gpu/drm/i915/intel_fbdev.c | 6 ++--- drivers/gpu/drm/i915/intel_overlay.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- drivers/gpu/drm/mgag200/mgag200_cursor.c | 2 +- drivers/gpu/drm/mgag200/mgag200_main.c | 4 +-- drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 2 +- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 6 ++--- drivers/gpu/drm/msm/msm_fb.c | 3 +-- drivers/gpu/drm/msm/msm_gem.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 2 +- drivers/gpu/drm/nouveau/nouveau_display.c | 4 +-- drivers/gpu/drm/nouveau/nouveau_gem.c | 8 +++--- drivers/gpu/drm/nouveau/nv50_display.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.c | 6 ++--- drivers/gpu/drm/omapdrm/omap_drv.h | 4 +-- drivers/gpu/drm/omapdrm/omap_fb.c | 2 +- drivers/gpu/drm/omapdrm/omap_gem.c | 2 +- drivers/gpu/drm/omapdrm/omap_plane.c | 2 +- drivers/gpu/drm/qxl/qxl_display.c | 6 +++-- drivers/gpu/drm/qxl/qxl_dumb.c | 2 +- drivers/gpu/drm/qxl/qxl_fb.c | 3 +++ drivers/gpu/drm/qxl/qxl_ioctl.c | 11 ++++---- drivers/gpu/drm/radeon/radeon_cs.c | 2 +- drivers/gpu/drm/radeon/radeon_cursor.c | 2 +- drivers/gpu/drm/radeon/radeon_display.c | 2 +- drivers/gpu/drm/radeon/radeon_gem.c | 16 +++++------ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 +-- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +-- drivers/gpu/drm/tegra/dc.c | 8 +++--- drivers/gpu/drm/tegra/drm.c | 20 +++++++------- drivers/gpu/drm/tegra/fb.c | 2 +- drivers/gpu/drm/tegra/gem.c | 2 +- drivers/gpu/drm/udl/udl_fb.c | 2 +- drivers/gpu/drm/udl/udl_gem.c | 2 +- drivers/gpu/drm/vc4/vc4_bo.c | 2 +- drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- drivers/gpu/drm/vc4/vc4_gem.c | 2 +- drivers/gpu/drm/vc4/vc4_plane.c | 2 +- drivers/gpu/drm/vgem/vgem_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 4 +-- drivers/gpu/drm/virtio/virtgpu_gem.c | 2 +- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 11 ++++---- include/drm/drm_atomic_helper.h | 9 +++---- include/drm/drm_fb_cma_helper.h | 5 +++- include/drm/drm_gem.h | 4 +-- 83 files changed, 203 insertions(+), 202 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx