This patchset cleans up drm_pci.{c,h}. Patch 1 removes drm_pci.c from
non-PCI builds. Declarations of legacy functions are hidden in drm_legacy.h
and their implementation is protected by CONFIG_PCI in patch 2. The rest
of the patches replace unnecessary include statements for drm_pci.h. Most
of the source files only require <linux/pci.h>.

The pathset was built on x86-64 and aarch64 with PCI support and arm
without PCI support.

Thomas Zimmermann (12):
  drm/pci: Only build drm_pci.c if CONFIG_PCI is set
  drm/pci: Hide legacy PCI functions from non-legacy code
  drm/ast: Don't include <drm/drm_pci.h>
  drm/i810: Don't include <drm/drm_pci.h>
  drm/mga: Don't include <drm/drm_pci.h>
  drm/mgag200: Don't include <drm/drm_pci.h>
  drm/r128: Don't include <drm/drm_pci.h>
  drm/radeon: Don't include <drm/drm_pci.h>
  drm/savage: Don't include <drm/drm_pci.h>
  drm/sis: Don't include <drm/drm_pci.h>
  drm/tdfx: Don't include <drm/drm_pci.h>
  drm/via: Don't include <drm/drm_pci.h>

 drivers/gpu/drm/Makefile                      |  3 +-
 drivers/gpu/drm/ast/ast_drv.c                 |  1 -
 drivers/gpu/drm/drm_internal.h                | 22 ++++++++++++++
 drivers/gpu/drm/drm_pci.c                     | 17 +++--------
 drivers/gpu/drm/i810/i810_dma.c               |  2 +-
 drivers/gpu/drm/i810/i810_drv.c               |  3 +-
 drivers/gpu/drm/mga/mga_drv.h                 |  2 +-
 drivers/gpu/drm/mgag200/mgag200_cursor.c      |  2 +-
 drivers/gpu/drm/mgag200/mgag200_i2c.c         |  3 +-
 drivers/gpu/drm/mgag200/mgag200_main.c        |  3 +-
 drivers/gpu/drm/mgag200/mgag200_mode.c        |  2 +-
 drivers/gpu/drm/mgag200/mgag200_ttm.c         |  2 +-
 drivers/gpu/drm/r128/r128_drv.c               |  2 +-
 drivers/gpu/drm/radeon/atom.h                 |  1 +
 drivers/gpu/drm/radeon/atombios_encoders.c    |  2 +-
 drivers/gpu/drm/radeon/btc_dpm.c              |  3 +-
 drivers/gpu/drm/radeon/ci_dpm.c               |  3 +-
 drivers/gpu/drm/radeon/cik.c                  |  4 +--
 drivers/gpu/drm/radeon/cypress_dpm.c          |  2 +-
 drivers/gpu/drm/radeon/evergreen.c            |  2 +-
 drivers/gpu/drm/radeon/kv_dpm.c               |  3 +-
 drivers/gpu/drm/radeon/ni.c                   |  4 +--
 drivers/gpu/drm/radeon/ni_dpm.c               |  3 +-
 drivers/gpu/drm/radeon/r100.c                 |  6 ++--
 drivers/gpu/drm/radeon/r300.c                 |  2 +-
 drivers/gpu/drm/radeon/r420.c                 |  2 +-
 drivers/gpu/drm/radeon/r600.c                 |  6 ++--
 drivers/gpu/drm/radeon/radeon_agp.c           |  3 +-
 drivers/gpu/drm/radeon/radeon_asic.c          |  2 +-
 drivers/gpu/drm/radeon/radeon_atombios.c      |  3 +-
 drivers/gpu/drm/radeon/radeon_bios.c          |  4 +--
 drivers/gpu/drm/radeon/radeon_clocks.c        |  3 +-
 drivers/gpu/drm/radeon/radeon_combios.c       |  3 +-
 drivers/gpu/drm/radeon/radeon_cs.c            |  2 +-
 drivers/gpu/drm/radeon/radeon_device.c        |  2 +-
 drivers/gpu/drm/radeon/radeon_display.c       |  2 +-
 drivers/gpu/drm/radeon/radeon_encoders.c      |  3 +-
 drivers/gpu/drm/radeon/radeon_fb.c            |  2 +-
 drivers/gpu/drm/radeon/radeon_gart.c          |  2 +-
 drivers/gpu/drm/radeon/radeon_gem.c           |  3 +-
 drivers/gpu/drm/radeon/radeon_i2c.c           |  2 +-
 drivers/gpu/drm/radeon/radeon_irq_kms.c       |  2 +-
 drivers/gpu/drm/radeon/radeon_kms.c           |  2 +-
 .../gpu/drm/radeon/radeon_legacy_encoders.c   |  2 +-
 drivers/gpu/drm/radeon/radeon_pm.c            |  2 +-
 drivers/gpu/drm/radeon/radeon_ttm.c           |  2 +-
 drivers/gpu/drm/radeon/rs600.c                |  2 +-
 drivers/gpu/drm/radeon/rs690.c                |  2 +-
 drivers/gpu/drm/radeon/rs780_dpm.c            |  3 +-
 drivers/gpu/drm/radeon/rv770.c                |  2 +-
 drivers/gpu/drm/radeon/si.c                   |  4 +--
 drivers/gpu/drm/radeon/si_dpm.c               |  3 +-
 drivers/gpu/drm/radeon/trinity_dpm.c          |  3 +-
 drivers/gpu/drm/savage/savage_drv.c           |  2 +-
 drivers/gpu/drm/sis/sis_drv.c                 |  2 +-
 drivers/gpu/drm/tdfx/tdfx_drv.c               |  2 +-
 drivers/gpu/drm/via/via_dmablit.c             |  2 +-
 drivers/gpu/drm/via/via_drv.c                 |  2 +-
 drivers/gpu/drm/via/via_map.c                 |  3 +-
 include/drm/drm_legacy.h                      | 29 ++++++++++++++++++-
 include/drm/drm_pci.h                         | 19 ++++++++++--
 61 files changed, 144 insertions(+), 89 deletions(-)

--
2.23.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to