So the main part here is the extraction of drm_gem.h. With a bit of prep work to ditch the legacy mmap stuff out of gem/ttm drivers. Plus a few random pieces of leftover cleanup that I've missed in my earlier header rework or just stumbled over while working on this. With this drmP.h really starts to look rather sane (it's just 1kloc now), besides maybe the uppercase P in it's name and the massive list of headers it includes. As usual comments and review highly welcome. I'll probably try to still throw this at Dave for 3.18 and see whether he rejects it or not. Otherwise no harm to postpone this until 3.19 (but David Herrrmann said he's got more work on his todo in this area, so merging earlier might avoid conflicts). Cheers, Daniel Daniel Vetter (8): drm/<ttm-based-drivers>: Don't call drm_mmap drm/gem: Don't call drm_mmap from drm_gem_mmap drm: move drm_mmap to <drm/drm_legacy.h> drm: Move drm_vm_open_locked into drm_internal.h drm: Move leftover ioctl declarations to drm_internal.h drm: Move internal debugfs functions to drm_internal.h drm: Extract <drm/drm_gem.h> drm/doc: Fixup drm_irq kerneldoc includes. Documentation/DocBook/drm.tmpl | 2 +- drivers/gpu/drm/armada/armada_gem.h | 2 + drivers/gpu/drm/ast/ast_drv.h | 2 + drivers/gpu/drm/ast/ast_ttm.c | 2 +- drivers/gpu/drm/bochs/bochs.h | 2 + drivers/gpu/drm/bochs/bochs_mm.c | 2 +- drivers/gpu/drm/cirrus/cirrus_drv.h | 2 + drivers/gpu/drm/cirrus/cirrus_ttm.c | 2 +- drivers/gpu/drm/drm_gem.c | 3 +- drivers/gpu/drm/drm_info.c | 2 + drivers/gpu/drm/drm_internal.h | 39 ++++++- drivers/gpu/drm/drm_prime.c | 2 + drivers/gpu/drm/drm_vm.c | 7 +- drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 + drivers/gpu/drm/gma500/gtt.h | 1 + drivers/gpu/drm/i810/i810_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/mga/mga_drv.c | 2 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 2 + drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 +- drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/nouveau/nouveau_bo.h | 2 + drivers/gpu/drm/nouveau/nouveau_ttm.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.h | 1 + drivers/gpu/drm/qxl/qxl_drv.h | 2 + drivers/gpu/drm/qxl/qxl_ttm.c | 2 +- drivers/gpu/drm/r128/r128_drv.c | 2 +- drivers/gpu/drm/radeon/radeon.h | 2 + drivers/gpu/drm/radeon/radeon_drv.c | 4 +- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/gpu/drm/savage/savage_drv.c | 2 +- drivers/gpu/drm/sis/sis_drv.c | 2 +- drivers/gpu/drm/tdfx/tdfx_drv.c | 3 +- drivers/gpu/drm/tegra/gem.h | 1 + drivers/gpu/drm/udl/udl_drv.h | 1 + drivers/gpu/drm/via/via_drv.c | 2 +- include/drm/drmP.h | 182 +------------------------------ include/drm/drm_gem.h | 183 ++++++++++++++++++++++++++++++++ include/drm/drm_gem_cma_helper.h | 1 + include/drm/drm_legacy.h | 1 + 40 files changed, 276 insertions(+), 203 deletions(-) create mode 100644 include/drm/drm_gem.h -- 2.1.0 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel