Hi
More cleanups of DRM core code. Diffstat says: 72 files changed, 832 insertions(+), 1038 deletions(-)
..which is already nice, but doesn't reflect that a lot of code is now hidden from main headers. Furthermore, with this series applied, drmP.h no longer looks as ugly as it is now (widly unstructured). It still ain't a beauty, though: include/drm/drmP.h | 236 ++++++++-----------------------
Anyhow, highlights: - drop "drm_memory.h" - drop "drm_usb.c" - drop "struct drm_waitlist" - drop "struct drm_sigdata" - drop "struct drm_bus" - drop "drm_master->unique_size"
Two patches are driver related: - radeon: Patch #1, moves drm_buffer.c to radeon/ - nouveau: Patch #17, splits drm_driver for nouveau They're rather trivial. Everything else is DRM-core.
I've moved some legacy stuff around so it's easier to drop it once unused. If someone disagrees with move, let me know and I'll drop the patch.
I've pushed this to the 0-day testing bots now. I'll comment on the patches in case something shows up.
Comments welcome! David
David Herrmann (20): drm/radeon: move drm_buffer to drm/radeon/ drm: mark drm_buf and drm_map as legacy drm: move "struct drm_vma_entry" to drm_vm.c drm: move "struct drm_magic_entry" to drm_auth.c drm: drop unused "struct drm_waitlist" drm: move AGP definitions harder drm: replace weird conditional includes drm: drop __KERNEL__ protection in drmP.h drm: merge drm_memory.h into drm_memory.c drm: move __OS_HAS_AGP into drm_agpsupport.h drm: order includes alphabetically in drmP.h drm: drop DRM_DEBUG_CODE drm: inline "struct drm_sigdata" drm: move remaining includes in drmP.h to the top drm: simplify drm_*_set_unique() drm: drop unused drm_master->unique_size drm: add driver->set_busid() callback drm: Goody bye, drm_bus! drm: merge drm_usb into udl drm: move drm-lock API to drm_legacy.h
Documentation/DocBook/drm.tmpl | 3 +- drivers/gpu/drm/Kconfig | 6 - drivers/gpu/drm/Makefile | 5 +- drivers/gpu/drm/armada/armada_drv.c | 1 + drivers/gpu/drm/ast/ast_drv.c | 1 + drivers/gpu/drm/bochs/bochs_drv.c | 1 + drivers/gpu/drm/cirrus/cirrus_drv.c | 1 + drivers/gpu/drm/drm_agpsupport.c | 1 + drivers/gpu/drm/drm_auth.c | 6 + drivers/gpu/drm/drm_buffer.c | 181 ------------------------ drivers/gpu/drm/drm_bufs.c | 89 ++++++------ drivers/gpu/drm/drm_debugfs.c | 2 - drivers/gpu/drm/drm_drv.c | 11 +- drivers/gpu/drm/drm_fops.c | 16 +-- drivers/gpu/drm/drm_info.c | 59 -------- drivers/gpu/drm/drm_ioctl.c | 27 ++-- drivers/gpu/drm/drm_legacy.h | 39 +++++ drivers/gpu/drm/drm_lock.c | 35 ++--- drivers/gpu/drm/drm_memory.c | 12 ++ drivers/gpu/drm/drm_pci.c | 41 ++---- drivers/gpu/drm/drm_platform.c | 38 ++--- drivers/gpu/drm/drm_usb.c | 88 ------------ drivers/gpu/drm/drm_vm.c | 74 ++++++++++ drivers/gpu/drm/exynos/exynos_drm_drv.c | 1 + drivers/gpu/drm/gma500/psb_drv.c | 1 + drivers/gpu/drm/i810/i810_dma.c | 4 +- drivers/gpu/drm/i810/i810_drv.c | 1 + drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/mga/mga_dma.c | 49 +++---- drivers/gpu/drm/mga/mga_drv.c | 1 + drivers/gpu/drm/mgag200/mgag200_drv.c | 1 + drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/nouveau/nouveau_drm.c | 19 ++- drivers/gpu/drm/omapdrm/omap_drv.c | 1 + drivers/gpu/drm/qxl/qxl_drv.c | 1 + drivers/gpu/drm/r128/r128_cce.c | 2 +- drivers/gpu/drm/r128/r128_drv.c | 1 + drivers/gpu/drm/radeon/Makefile | 2 +- drivers/gpu/drm/radeon/drm_buffer.c | 177 +++++++++++++++++++++++ drivers/gpu/drm/radeon/drm_buffer.h | 148 +++++++++++++++++++ drivers/gpu/drm/radeon/r300_cmdbuf.c | 2 +- drivers/gpu/drm/radeon/r600_cp.c | 2 +- drivers/gpu/drm/radeon/radeon.h | 17 ++- drivers/gpu/drm/radeon/radeon_cp.c | 22 +-- drivers/gpu/drm/radeon/radeon_drv.c | 2 + drivers/gpu/drm/radeon/radeon_ring.c | 21 --- drivers/gpu/drm/radeon/radeon_state.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 1 + drivers/gpu/drm/savage/savage_bci.c | 23 +-- drivers/gpu/drm/savage/savage_drv.c | 1 + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 1 + drivers/gpu/drm/sis/sis_drv.c | 1 + drivers/gpu/drm/sis/sis_mm.c | 6 +- drivers/gpu/drm/tdfx/tdfx_drv.c | 1 + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 1 + drivers/gpu/drm/udl/Kconfig | 3 +- drivers/gpu/drm/udl/udl_connector.c | 4 +- drivers/gpu/drm/udl/udl_drv.c | 102 +++++++------ drivers/gpu/drm/udl/udl_drv.h | 1 + drivers/gpu/drm/udl/udl_main.c | 8 +- drivers/gpu/drm/via/via_drv.c | 1 + drivers/gpu/drm/via/via_map.c | 2 +- drivers/gpu/drm/via/via_mm.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + drivers/staging/imx-drm/imx-drm-core.c | 1 + include/drm/drmP.h | 236 ++++++++----------------------- include/drm/drm_agpsupport.h | 26 +++- include/drm/drm_buffer.h | 148 ------------------- include/drm/drm_crtc.h | 4 +- include/drm/drm_memory.h | 59 -------- include/drm/drm_usb.h | 15 -- 72 files changed, 832 insertions(+), 1038 deletions(-) delete mode 100644 drivers/gpu/drm/drm_buffer.c delete mode 100644 drivers/gpu/drm/drm_usb.c create mode 100644 drivers/gpu/drm/radeon/drm_buffer.c create mode 100644 drivers/gpu/drm/radeon/drm_buffer.h delete mode 100644 include/drm/drm_buffer.h delete mode 100644 include/drm/drm_memory.h delete mode 100644 include/drm/drm_usb.h