[PATCH v1 0/10] drm/amd: drop use of drmP.h

Sam Ravnborg sam at ravnborg.org
Sun Jun 9 22:07:47 UTC 2019


This patcset drop all uses of drm_os_linux.h and
drmP.h in drm/amd/.
The patchset depends on the earlier series removing drmP.h
from drm/radeon.
https://lists.freedesktop.org/archives/dri-devel/2019-June/220969.html

The only dependency os the patch to drm_debugfs.h:
https://lists.freedesktop.org/archives/dri-devel/2019-June/220971.html

The removal was done in a number of steps, mainly to easy potential reviews
and to allow some parts to be applied if not everything are OK.
The patches are made on top of drm-misc-next.

There is a single patch touching drm_print.h - this was needed
to prevent adding include of <drm/drm.h> to a lot of files,
because it is required by one of the macros in drm_print.h.
As this patch only adds an include file, it should be straightforward to apply.

All patches are build tested with various configs and various architectures.

In a few cases the include of header files was re-arranged, but in
general the changes are kept to a minimum.
When adding new include files the different blocks of include
failes are seperated by empty lines.
This account for some of the added lines.

	Sam

Sam Ravnborg (10):
      drm: fix build errors with drm_print.h
      drm/amd: drop dependencies on drm_os_linux.h
      drm/amd: drop use of drmp.h in os_types.h
      drm/amd: drop use of drmP.h in amdgpu.h
      drm/amd: drop use of drmP.h in atom.h
      drm/amd: drop use of drmP.h from all header files
      drm/amd: drop use of drmP.h in powerplay/
      drm/amd: drop use of drmP.h in display/
      drm/amd: drop use of drmP.h in amdgpu/amdgpu*
      drm/amd: drop use of drmP.h in remaining files

 drivers/gpu/drm/amd/amdgpu/amdgpu.h                  |  4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c              |  1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c             |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c             |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c           |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c    |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c    |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c    |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c     |  6 ++++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c         |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c     |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c        |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c             |  3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c          |  3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c              |  3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c       |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c               |  4 +++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c          |  7 +++++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c           |  3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c          |  4 +++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c              |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c         |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c               | 14 +++++++-------
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c            |  4 +++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c             |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c              |  6 +++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c              |  2 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c          |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c              |  3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c               |  4 +++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c               |  3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ioc32.c            |  3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c              |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_job.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c              |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c               |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c           |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c               |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c              |  2 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c             |  3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c               |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c            |  3 +++
 drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h            |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c             |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c             |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_test.c             |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h            |  2 --
 drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c     |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c              | 20 ++++++++++++--------
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c              |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c              |  4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c              | 11 ++++++-----
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c             |  4 ++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c               |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c         |  2 +-
 drivers/gpu/drm/amd/amdgpu/atom.h                    |  3 ++-
 drivers/gpu/drm/amd/amdgpu/atombios_crtc.c           |  2 +-
 drivers/gpu/drm/amd/amdgpu/atombios_dp.c             |  2 +-
 drivers/gpu/drm/amd/amdgpu/atombios_encoders.c       |  4 +++-
 drivers/gpu/drm/amd/amdgpu/atombios_i2c.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/cik.c                     |  3 ++-
 drivers/gpu/drm/amd/amdgpu/cik_ih.c                  |  4 +++-
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c                |  6 ++++--
 drivers/gpu/drm/amd/amdgpu/cz_ih.c                   |  4 +++-
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c               |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c               |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c                |  7 ++++++-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c                |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/dce_virtual.c             |  4 +++-
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c                |  4 +++-
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c                |  6 ++++--
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c                |  8 ++++++--
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c                |  8 ++++++--
 drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c                |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c                |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c                |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c                |  4 ++++
 drivers/gpu/drm/amd/amdgpu/iceland_ih.c              |  4 +++-
 drivers/gpu/drm/amd/amdgpu/kv_dpm.c                  |  2 +-
 drivers/gpu/drm/amd/amdgpu/kv_smc.c                  |  2 +-
 drivers/gpu/drm/amd/amdgpu/psp_v10_0.c               |  3 +++
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c               |  2 ++
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c                |  4 +++-
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c               |  7 +++++--
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c               |  7 +++++--
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c               |  7 +++++--
 drivers/gpu/drm/amd/amdgpu/si.c                      |  3 ++-
 drivers/gpu/drm/amd/amdgpu/si_dma.c                  |  4 ++--
 drivers/gpu/drm/amd/amdgpu/si_dpm.c                  |  4 +++-
 drivers/gpu/drm/amd/amdgpu/si_ih.c                   |  4 +++-
 drivers/gpu/drm/amd/amdgpu/si_smc.c                  |  2 +-
 drivers/gpu/drm/amd/amdgpu/soc15.c                   |  3 ++-
 drivers/gpu/drm/amd/amdgpu/tonga_ih.c                |  4 +++-
 drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c                |  4 ++--
 drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c                |  6 ++++--
 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c                |  6 +++---
 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c                |  6 +++---
 drivers/gpu/drm/amd/amdgpu/vce_v2_0.c                |  2 +-
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c                |  2 +-
 drivers/gpu/drm/amd/amdgpu/vce_v4_0.c                |  2 +-
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c                |  2 +-
 drivers/gpu/drm/amd/amdgpu/vega10_ih.c               |  4 +++-
 drivers/gpu/drm/amd/amdgpu/vi.c                      |  4 +++-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c    |  4 +++-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h    |  5 ++++-
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c    |  1 +
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c    |  4 +++-
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c    |  1 -
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c    |  2 --
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c |  1 -
 .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c   |  1 -
 drivers/gpu/drm/amd/display/dc/basics/vector.c       |  2 ++
 drivers/gpu/drm/amd/display/dc/bios/bios_parser.c    |  2 ++
 drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c   |  2 ++
 drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c     |  2 ++
 drivers/gpu/drm/amd/display/dc/core/dc.c             |  2 ++
 .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c    |  2 ++
 drivers/gpu/drm/amd/display/dc/core/dc_link.c        |  2 ++
 drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c    |  2 ++
 drivers/gpu/drm/amd/display/dc/core/dc_resource.c    |  3 +++
 drivers/gpu/drm/amd/display/dc/core/dc_sink.c        |  2 ++
 drivers/gpu/drm/amd/display/dc/core/dc_stream.c      |  3 +++
 drivers/gpu/drm/amd/display/dc/core/dc_surface.c     |  2 ++
 drivers/gpu/drm/amd/display/dc/dc_helper.c           |  3 +++
 drivers/gpu/drm/amd/display/dc/dce/dce_abm.c         |  2 ++
 drivers/gpu/drm/amd/display/dc/dce/dce_audio.c       |  2 ++
 drivers/gpu/drm/amd/display/dc/dce/dce_aux.c         |  3 +++
 drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c     |  2 ++
 .../gpu/drm/amd/display/dc/dce/dce_clock_source.c    |  2 ++
 drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c        |  3 +++
 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c      |  3 +++
 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c      |  3 +++
 drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c         |  2 ++
 .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c    |  3 +++
 drivers/gpu/drm/amd/display/dc/dce/dce_opp.c         |  2 ++
 .../gpu/drm/amd/display/dc/dce/dce_stream_encoder.c  |  2 ++
 .../gpu/drm/amd/display/dc/dce100/dce100_resource.c  |  3 +++
 .../drm/amd/display/dc/dce110/dce110_compressor.c    |  3 +++
 .../drm/amd/display/dc/dce110/dce110_hw_sequencer.c  |  3 +++
 .../drm/amd/display/dc/dce110/dce110_opp_regamma_v.c |  2 ++
 .../gpu/drm/amd/display/dc/dce110/dce110_resource.c  |  2 ++
 .../drm/amd/display/dc/dce110/dce110_transform_v.c   |  2 ++
 .../drm/amd/display/dc/dce112/dce112_compressor.c    |  3 +++
 .../gpu/drm/amd/display/dc/dce112/dce112_resource.c  |  2 ++
 .../gpu/drm/amd/display/dc/dce120/dce120_resource.c  |  2 ++
 .../gpu/drm/amd/display/dc/dce80/dce80_resource.c    |  2 ++
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c |  2 ++
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c  |  2 ++
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c     |  2 ++
 .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c    |  3 +++
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c     |  2 ++
 .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c    |  2 ++
 .../drm/amd/display/dc/dcn10/dcn10_stream_encoder.c  |  1 +
 drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c      |  2 ++
 drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c   |  2 ++
 drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c         |  3 +++
 drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c     |  2 ++
 drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c         |  2 ++
 .../amd/display/dc/irq/dce110/irq_service_dce110.c   |  2 ++
 .../amd/display/dc/irq/dce120/irq_service_dce120.c   |  2 ++
 .../drm/amd/display/dc/irq/dce80/irq_service_dce80.c |  2 ++
 .../drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c |  2 ++
 drivers/gpu/drm/amd/display/dc/irq/irq_service.c     |  2 ++
 drivers/gpu/drm/amd/display/dc/os_types.h            |  8 +++++---
 .../amd/display/dc/virtual/virtual_link_encoder.c    |  2 ++
 .../amd/display/dc/virtual/virtual_stream_encoder.c  |  2 ++
 .../gpu/drm/amd/display/modules/color/color_gamma.c  |  3 +++
 .../gpu/drm/amd/display/modules/freesync/freesync.c  |  2 ++
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c           |  4 ++--
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c     |  1 +
 drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c     |  3 +++
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c   |  1 +
 .../drm/amd/powerplay/hwmgr/vega10_processpptables.c |  1 +
 drivers/gpu/drm/amd/powerplay/smu_v11_0.c            |  4 +++-
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c     |  1 +
 .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c    |  1 +
 .../gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c  |  2 ++
 drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c  |  2 ++
 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c  |  1 +
 drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c |  2 ++
 include/drm/drm_print.h                              |  2 ++
 189 files changed, 444 insertions(+), 153 deletions(-)




More information about the dri-devel mailing list