This patch moves the DRM core's AGP code behind CONFIG_DRM_LEGACY. The only use besides legacy, UMS drivers is radeon, which can implement the required functionality by itself. This patchset has no impact on the AGP support of existing drivers. Patches 1 and 2 move some AGP code from DRM core into radeon. Radeon uses some of the AGP code for its internal purposes. But being a KMS driver, there's no reason why radeon should provide the rsp AGP ioctls. So duplicate the implementation in radeon and thus uncould it from the legacy code. Patch 3 moves some AGP-related PCI helpers behind CONFIG_DRM_LEGACY. Patch 4 moves DRM's AGP code behind CONFIG_DRM_LEGACY. The files are then only build when legacy drivers are active. Built-tested with different config options selected. Thomas Zimmermann (4): drm/radeon: Move AGP helpers into radeon driver drm/radeon: Move AGP data structures into radeon drm: Mark PCI AGP helpers as legacy drm: Mark AGP implementation and ioctls as legacy drivers/gpu/drm/Makefile | 6 +- drivers/gpu/drm/drm_agpsupport.c | 99 ++++++++++++----------- drivers/gpu/drm/drm_bufs.c | 1 - drivers/gpu/drm/drm_drv.c | 4 +- drivers/gpu/drm/drm_internal.h | 5 -- drivers/gpu/drm/drm_ioc32.c | 19 +++-- drivers/gpu/drm/drm_ioctl.c | 24 +++--- drivers/gpu/drm/drm_legacy.h | 30 +++++++ drivers/gpu/drm/drm_legacy_misc.c | 1 - drivers/gpu/drm/drm_memory.c | 1 - drivers/gpu/drm/drm_pci.c | 23 +++--- drivers/gpu/drm/drm_vm.c | 2 - drivers/gpu/drm/i810/i810_dma.c | 3 +- drivers/gpu/drm/mga/mga_dma.c | 16 ++-- drivers/gpu/drm/mga/mga_drv.h | 1 - drivers/gpu/drm/r128/r128_cce.c | 2 +- drivers/gpu/drm/radeon/radeon.h | 42 ++++++++++ drivers/gpu/drm/radeon/radeon_agp.c | 118 ++++++++++++++++++++++++---- drivers/gpu/drm/radeon/radeon_drv.c | 13 --- drivers/gpu/drm/radeon/radeon_kms.c | 18 +++-- drivers/gpu/drm/radeon/radeon_ttm.c | 6 +- drivers/gpu/drm/via/via_dma.c | 1 - include/drm/drm_agpsupport.h | 117 --------------------------- include/drm/drm_device.h | 6 +- include/drm/drm_legacy.h | 82 +++++++++++++++++++ 25 files changed, 375 insertions(+), 265 deletions(-) delete mode 100644 include/drm/drm_agpsupport.h -- 2.31.1
