Skip to contentSkip to conversation

drm/amd: drop use of drmP.h

PATCH In review Sam Ravnborg 4 participants 17 messages Jun 9, 2019 – Jun 11, 2019 3 messages not in the archive

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

cover drm/amd: drop use of drmP.h

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(-)

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#1 lore raw

PATCH 1/10 drm: fix build errors with drm_print.h

drm_print.h requires <drm/drm.h> to fix build when macros are used. Pull in the header file in drm_print.h so users do not have to do it.

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 include/drm/drm_print.h | 2 ++
 1 file changed, 2 insertions(+)
include/drm/drm_print.h +2 -0
index 3a4247319e63..a5d6f2f3e430 100644
@@ -32,6 +32,8 @@
 #include <linux/device.h>
 #include <linux/debugfs.h>
 
+#include <drm/drm.h>
+
 /**
  * DOC: print
  *
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw

Re: [PATCH v1 01/10] drm: fix build errors with drm_print.h

Quoted 18 lines · Sam Ravnborg

drm_print.h requires <drm/drm.h> to fix build when macros are used. Pull in the header file in drm_print.h so users do not have to do it.

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 include/drm/drm_print.h | 2 ++
 1 file changed, 2 insertions(+)
include/drm/drm_print.h +0 -0
index 3a4247319e63..a5d6f2f3e430 100644

include/drm/drm_print.h line 35

Quoted 4 lines
include/drm/drm_print.h +1 -0
@@ -32,6 +32,8 @@
 #include <linux/device.h>
 #include <linux/debugfs.h>
 
+#include <drm/drm.h>

What goes boom without this? Only drm/drm.h that I could find was the one in uapi/drm/drm.h, and that one looks very fishy to include from an internal helper header like print.h.
-Daniel

Quoted 7 lines
include/drm/drm_print.h +1 -0
+
 /**
  * DOC: print
  *
Signature · 1 line
2.20.1
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

A message that is not in the archive (sent off-list or not yet received): 20190611083911.GT21222-dv86pmgwkMBes7Z6vYuT8azUEOm+Xw19@public.gmane.org

#4 lore raw

Re: [PATCH v1 01/10] drm: fix build errors with drm_print.h

Hi Daniel.

Quoted 22 lines · Daniel Vetter
Quoted 21 lines · Sam Ravnborg

drm_print.h requires <drm/drm.h> to fix build when macros are used. Pull in the header file in drm_print.h so users do not have to do it.

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 include/drm/drm_print.h | 2 ++
 1 file changed, 2 insertions(+)
include/drm/drm_print.h +0 -0
index 3a4247319e63..a5d6f2f3e430 100644
@@ -32,6 +32,8 @@
 #include <linux/device.h>
 #include <linux/debugfs.h>
 
Quoted 5 lines

include/drm/drm_print.h line 35

Quoted 1 line
include/drm/drm_print.h +1 -0
+#include <drm/drm.h>

What goes boom without this? Only drm/drm.h that I could find was the one in uapi/drm/drm.h, and that one looks very fishy to include from an internal helper header like print.h.

drm_print.h uses DRM_NAME - which is defined only in uapi/drm/drm.h. The error is seen when you include drm_print.h and not much other drm header files.
Tiday we rely on other drm header files to pull in drm.h.

Notice - the error only manifest itself when the macros are used. Including the drm_print.h will not do it.

Sam
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#5 lore raw

Re: [PATCH v1 01/10] drm: fix build errors with drm_print.h

Quoted 31 lines · Sam Ravnborg

Hi Daniel.

Quoted 22 lines · Daniel Vetter
Quoted 21 lines · Sam Ravnborg

drm_print.h requires <drm/drm.h> to fix build when macros are used. Pull in the header file in drm_print.h so users do not have to do it.

Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Sean Paul <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 include/drm/drm_print.h | 2 ++
 1 file changed, 2 insertions(+)
include/drm/drm_print.h +0 -0
index 3a4247319e63..a5d6f2f3e430 100644
@@ -32,6 +32,8 @@
 #include <linux/device.h>
 #include <linux/debugfs.h>
 
Quoted 5 lines

include/drm/drm_print.h line 35

Quoted 1 line
include/drm/drm_print.h +1 -0
+#include <drm/drm.h>

What goes boom without this? Only drm/drm.h that I could find was the one in uapi/drm/drm.h, and that one looks very fishy to include from an internal helper header like print.h.

Quoted 7 lines

drm_print.h uses DRM_NAME - which is defined only in uapi/drm/drm.h. The error is seen when you include drm_print.h and not much other drm header files.
Tiday we rely on other drm header files to pull in drm.h.

Notice - the error only manifest itself when the macros are used. Including the drm_print.h will not do it.

Uh, I think let's just inline DRM_NAME, that also cleans up the code. And drop the uapi include from drm internal headers, that feels bad. In general I think uapi headers should only be included by the .c files that actually implement ioctls and stuff like that.

Can you pls do that patch for drm_print.h?

Thanks, Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#6 lore raw

Re: [PATCH v1 01/10] drm: fix build errors with drm_print.h

Hi Daniel.

Quoted 9 lines
Quoted 8 lines

drm_print.h uses DRM_NAME - which is defined only in uapi/drm/drm.h. The error is seen when you include drm_print.h and not much other drm header files.
Tiday we rely on other drm header files to pull in drm.h.

Notice - the error only manifest itself when the macros are used. Including the drm_print.h will not do it.

Quoted 6 lines

Uh, I think let's just inline DRM_NAME, that also cleans up the code. And drop the uapi include from drm internal headers, that feels bad. In general I think uapi headers should only be included by the .c files that actually implement ioctls and stuff like that.

Can you pls do that patch for drm_print.h?

Yep - will do in a few days.

Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#7 lore raw

PATCH 2/10 drm/amd: drop dependencies on drm_os_linux.h

In reply to Sam Ravnborg

Fix so no files in drm/amd/ depends on the deprecated drm_os_linux.h header file.

It was done manually:
- remove drm_os_linux.h from drmP.h
- fix all build errros

Cc Alex Deucher <[email protected]>
Cc "Christian König" <[email protected]>
Cc "David (ChunMing) Zhou" <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c    |  4 +++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c         |  2 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c         | 17 ++++++++++-------
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c         |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c         |  8 ++++----
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c           |  2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c           |  2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c           |  2 +-
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c           |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c           |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c          |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c          |  5 ++++-
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c          |  4 +++-
 drivers/gpu/drm/amd/amdgpu/si_dma.c             |  2 +-
 drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c           |  2 +-
 drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c           |  4 +++-
 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c           |  4 ++--
 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c           |  4 ++--
 .../drm/amd/display/dc/core/dc_hw_sequencer.c   |  2 ++
 drivers/gpu/drm/amd/display/dc/core/dc_stream.c |  2 ++
 drivers/gpu/drm/amd/display/dc/dc_helper.c      |  3 +++
 drivers/gpu/drm/amd/display/dc/dce/dce_aux.c    |  2 ++
 drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c   |  2 ++
 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c |  3 +++
 drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c |  3 +++
 .../drm/amd/display/dc/dce/dce_link_encoder.c   |  2 ++
 .../drm/amd/display/dc/dce/dce_stream_encoder.c |  2 ++
 .../amd/display/dc/dce110/dce110_compressor.c   |  2 ++
 .../amd/display/dc/dce110/dce110_hw_sequencer.c |  3 +++
 .../display/dc/dce110/dce110_opp_regamma_v.c    |  2 ++
 .../amd/display/dc/dce110/dce110_transform_v.c  |  2 ++
 .../amd/display/dc/dce112/dce112_compressor.c   |  2 ++
 .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c |  2 ++
 .../amd/display/dc/dcn10/dcn10_link_encoder.c   |  2 ++
 .../amd/display/dc/dcn10/dcn10_stream_encoder.c |  1 +
 drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c    |  2 ++
 36 files changed, 90 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +3 -1
index a6e5184d436c..d2b51bc3f534 100644
@@ -22,10 +22,12 @@
 
 #define pr_fmt(fmt) "kfd2kgd: " fmt
 
+#include <linux/dma-buf.h>
 #include <linux/list.h>
 #include <linux/pagemap.h>
 #include <linux/sched/mm.h>
-#include <linux/dma-buf.h>
+#include <linux/sched/task.h>
+
 #include <drm/drmP.h>
 #include "amdgpu_object.h"
 #include "amdgpu_vm.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +2 -0
index 250d9212cc38..924d83e711ef 100644
@@ -24,6 +24,8 @@
  *
  */
 
+#include <linux/io-64-nonatomic-lo-hi.h>
+
 #include "amdgpu.h"
 
 /**
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +10 -7
index 0c52d1f9fe0f..e9ede34dd875 100644
@@ -29,6 +29,16 @@
  *    Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
  *    Dave Airlie
  */
+
+#include <linux/debugfs.h>
+#include <linux/iommu.h>
+#include <linux/pagemap.h>
+#include <linux/sched/task.h>
+#include <linux/seq_file.h>
+#include <linux/slab.h>
+#include <linux/swap.h>
+#include <linux/swiotlb.h>
+
 #include <drm/ttm/ttm_bo_api.h>
 #include <drm/ttm/ttm_bo_driver.h>
 #include <drm/ttm/ttm_placement.h>
@@ -36,13 +46,6 @@
 #include <drm/ttm/ttm_page_alloc.h>
 #include <drm/drmP.h>
 #include <drm/amdgpu_drm.h>
-#include <linux/seq_file.h>
-#include <linux/slab.h>
-#include <linux/swiotlb.h>
-#include <linux/swap.h>
-#include <linux/pagemap.h>
-#include <linux/debugfs.h>
-#include <linux/iommu.h>
 #include "amdgpu.h"
 #include "amdgpu_object.h"
 #include "amdgpu_trace.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +1 -1
index c021b114c8a4..fa03081c2f78 100644
@@ -1090,7 +1090,7 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring)
 	for (i = 0; i < timeout; i++) {
 		if (amdgpu_ring_get_rptr(ring) != rptr)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= timeout)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +4 -4
index ecf6f96df2ad..7ed5d4e3884d 100644
@@ -446,7 +446,7 @@ int amdgpu_vcn_dec_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9));
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
@@ -608,7 +608,7 @@ int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring)
 	for (i = 0; i < adev->usec_timeout; i++) {
 		if (amdgpu_ring_get_rptr(ring) != rptr)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
@@ -767,7 +767,7 @@ int amdgpu_vcn_jpeg_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9));
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
@@ -841,7 +841,7 @@ int amdgpu_vcn_jpeg_ring_test_ib(struct amdgpu_ring *ring, long timeout)
 		tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9));
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +1 -1
index d42808b05971..063057ca18be 100644
@@ -640,7 +640,7 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = le32_to_cpu(adev->wb.wb[index]);
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
index c0cb244f58cd..4f761ebb655e 100644
@@ -1812,7 +1812,7 @@ static int gfx_v6_0_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = RREG32(scratch);
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +1 -1
index a59e0fdf5a97..a61325ede1f8 100644
@@ -2080,7 +2080,7 @@ static int gfx_v7_0_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = RREG32(scratch);
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 	if (i >= adev->usec_timeout)
 		r = -ETIMEDOUT;
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +4 -1
index 02955e6e9dd9..775f6bd4fff6 100644
@@ -20,8 +20,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/firmware.h>
+
 #include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_gfx.h"
@@ -855,7 +858,7 @@ static int gfx_v8_0_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = RREG32(scratch);
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +4 -1
index ba67d1023264..f35c1122f12b 100644
@@ -20,8 +20,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/firmware.h>
+
 #include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_gfx.h"
@@ -417,7 +420,7 @@ static int gfx_v9_0_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = RREG32(scratch);
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +4 -1
index 36196372e8db..bd7c8f5cd0e7 100644
@@ -21,7 +21,10 @@
  *
  * Authors: Alex Deucher
  */
+
+#include <linux/delay.h>
 #include <linux/firmware.h>
+
 #include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ucode.h"
@@ -574,7 +577,7 @@ static int sdma_v2_4_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = le32_to_cpu(adev->wb.wb[index]);
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +4 -1
index 6d39544e7829..346e1910641d 100644
@@ -21,7 +21,10 @@
  *
  * Authors: Alex Deucher
  */
+
+#include <linux/delay.h>
 #include <linux/firmware.h>
+
 #include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ucode.h"
@@ -846,7 +849,7 @@ static int sdma_v3_0_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = le32_to_cpu(adev->wb.wb[index]);
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +3 -1
index 9c88ce513d78..08e0f81b87b5 100644
@@ -22,6 +22,8 @@
  */
 
 #include <linux/firmware.h>
+#include <linux/delay.h>
+
 #include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ucode.h"
@@ -1207,7 +1209,7 @@ static int sdma_v4_0_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = le32_to_cpu(adev->wb.wb[index]);
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
drivers/gpu/drm/amd/amdgpu/si_dma.c +1 -1
index 3eeefd40dae0..1108eb66277d 100644
@@ -230,7 +230,7 @@ static int si_dma_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = le32_to_cpu(adev->wb.wb[index]);
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +1 -1
index c4fb58667fd4..037606a5f185 100644
@@ -491,7 +491,7 @@ static int uvd_v4_2_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = RREG32(mmUVD_CONTEXT_ID);
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +3 -1
index 52bd8a654734..c88aa2d6a2b5 100644
@@ -22,7 +22,9 @@
  * Authors: Christian König <[email protected]>
  */
 
+#include <linux/delay.h>
 #include <linux/firmware.h>
+
 #include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_uvd.h"
@@ -506,7 +508,7 @@ static int uvd_v5_0_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = RREG32(mmUVD_CONTEXT_ID);
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +2 -2
index c9edddf9f88a..50af37d08b91 100644
@@ -183,7 +183,7 @@ static int uvd_v6_0_enc_ring_test_ring(struct amdgpu_ring *ring)
 	for (i = 0; i < adev->usec_timeout; i++) {
 		if (amdgpu_ring_get_rptr(ring) != rptr)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
@@ -957,7 +957,7 @@ static int uvd_v6_0_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = RREG32(mmUVD_CONTEXT_ID);
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +2 -2
index 2191d3d0a219..e36b69945ea2 100644
@@ -191,7 +191,7 @@ static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring *ring)
 	for (i = 0; i < adev->usec_timeout; i++) {
 		if (amdgpu_ring_get_rptr(ring) != rptr)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
@@ -1227,7 +1227,7 @@ static int uvd_v7_0_ring_test_ring(struct amdgpu_ring *ring)
 		tmp = RREG32_SOC15(UVD, ring->me, mmUVD_CONTEXT_ID);
 		if (tmp == 0xDEADBEEF)
 			break;
-		DRM_UDELAY(1);
+		udelay(1);
 	}
 
 	if (i >= adev->usec_timeout)
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +2 -0
index 83d121510ef5..9b01078d6ec5 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/delay.h>
+
 #include "dm_services.h"
 #include "core_types.h"
 #include "timing_generator.h"
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +2 -0
index 96e97d25d639..1dc3492f02a1 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/delay.h>
+
 #include "dm_services.h"
 #include "dc.h"
 #include "core_types.h"
drivers/gpu/drm/amd/display/dc/dc_helper.c +3 -0
index 5e6c5eff49cf..eb2d01d1a678 100644
@@ -26,6 +26,9 @@
  *  Created on: Aug 30, 2016
  *      Author: agrodzov
  */
+
+#include <linux/delay.h>
+
 #include "dm_services.h"
 #include <stdarg.h>
 
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +2 -0
index bd33c47183fc..0863719b0c85 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/delay.h>
+
 #include "dm_services.h"
 #include "core_types.h"
 #include "dce_aux.h"
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c +2 -0
index 818536eea00a..a8c2cf260c84 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/delay.h>
+
 #include "core_types.h"
 #include "link_encoder.h"
 #include "dce_dmcu.h"
drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c +3 -0
index cd26161bcc4d..8a236d40d8d0 100644
@@ -22,6 +22,9 @@
  * Authors: AMD
  *
  */
+
+#include <linux/delay.h>
+
 #include "dce_i2c.h"
 #include "dce_i2c_hw.h"
 #include "reg_helper.h"
drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c +3 -0
index f0266694cb56..a5a11c251e25 100644
@@ -22,6 +22,9 @@
  * Authors: AMD
  *
  */
+
+#include <linux/delay.h>
+
 #include "dce_i2c.h"
 #include "dce_i2c_sw.h"
 #include "include/gpio_service_interface.h"
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +2 -0
index 314c04a915d2..1037d2a72f3f 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/delay.h>
+
 #include "reg_helper.h"
 
 #include "core_types.h"
drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c +2 -0
index 14309fe6f2e6..0c0b41d70f65 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/delay.h>
+
 #include "dc_bios_types.h"
 #include "dce_stream_encoder.h"
 #include "reg_helper.h"
drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c +2 -0
index 7b23239d33fe..12083bb8ef02 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/delay.h>
+
 #include "dm_services.h"
 
 #include "dce/dce_11_0_d.h"
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +3 -0
index 7ac50ab1b762..54c266e84416 100644
@@ -22,6 +22,9 @@
  * Authors: AMD
  *
  */
+
+#include <linux/delay.h>
+
 #include "dm_services.h"
 #include "dc.h"
 #include "dc_bios_types.h"
drivers/gpu/drm/amd/display/dc/dce110/dce110_opp_regamma_v.c +2 -0
index 9b65b77e8823..34c5e3c7c6d2 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/delay.h>
+
 #include "dm_services.h"
 
 /* include DCE11 register header files */
drivers/gpu/drm/amd/display/dc/dce110/dce110_transform_v.c +2 -0
index aa8d6b10d2c3..b1aaab5590cc 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/delay.h>
+
 #include "dce110_transform_v.h"
 #include "dm_services.h"
 #include "dc.h"
drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c +2 -0
index faae12cf7968..f9819df1d3e2 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/delay.h>
+
 #include "dm_services.h"
 
 #include "dce/dce_11_2_d.h"
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c +2 -0
index 0db2a6e96fc0..3d31dadfa012 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/delay.h>
+
 #include "dm_services.h"
 #include "dcn10_hubp.h"
 #include "dcn10_hubbub.h"
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c +2 -0
index 0126a44ba012..102d968a8cd3 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/delay.h>
+
 #include "reg_helper.h"
 
 #include "core_types.h"
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c +1 -0
index 8ee9f6dc1d62..c33153d696ac 100644
@@ -23,6 +23,7 @@
  *
  */
 
+#include <linux/delay.h>
 
 #include "dc_bios_types.h"
 #include "dcn10_stream_encoder.h"
drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c +2 -0
index 310f48965b27..8ebeabad7bb7 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/delay.h>
+
 #include "dm_services.h"
 
 #include "include/gpio_types.h"
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

A message that is not in the archive (sent off-list or not yet received): 20190609220757.10862-1-sam-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org

#9 lore raw

PATCH 3/10 drm/amd: drop use of drmp.h in os_types.h

Drop use of the deprecated drmP.h from display/dc/os_types.h

Fix all fallout after this change.
Most of the fixes was adding a missing include of vmalloc.h.

Cc Alex Deucher <[email protected]>
Cc "Christian König" <[email protected]>
Cc "David (ChunMing) Zhou" <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/amd/display/dc/basics/vector.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 ++
 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           | 1 +
 drivers/gpu/drm/amd/display/dc/core/dc_surface.c          | 2 ++
 drivers/gpu/drm/amd/display/dc/dce/dce_audio.c            | 2 ++
 drivers/gpu/drm/amd/display/dc/dce/dce_aux.c              | 1 +
 drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c          | 2 ++
 drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c     | 2 ++
 drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c             | 1 +
 drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c              | 2 ++
 drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c     | 1 +
 drivers/gpu/drm/amd/display/dc/dce/dce_opp.c              | 2 ++
 drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c   | 3 +++
 drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c   | 2 ++
 drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c | 1 +
 drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c   | 2 ++
 drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c   | 2 ++
 drivers/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_ipp.c          | 2 ++
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 1 +
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c          | 2 ++
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c     | 2 ++
 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              | 1 +
 drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c          | 2 ++
 drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c              | 2 ++
 .../drm/amd/display/dc/irq/dce110/irq_service_dce110.c    | 2 ++
 .../drm/amd/display/dc/irq/dce120/irq_service_dce120.c    | 2 ++
 .../gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c  | 2 ++
 .../gpu/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 +++++---
 .../gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c | 2 ++
 .../drm/amd/display/dc/virtual/virtual_stream_encoder.c   | 2 ++
 drivers/gpu/drm/amd/display/modules/color/color_gamma.c   | 3 +++
 drivers/gpu/drm/amd/display/modules/freesync/freesync.c   | 2 ++
 44 files changed, 86 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/basics/vector.c +2 -0
index d28e9cf0e961..8f93d25f91ee 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "include/vector.h"
 
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +2 -0
index fd5266a58297..5e1b849684a6 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "ObjectID.h"
drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c +2 -0
index f3aa7b53d2aa..7108d51a9c5b 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dce_calcs.h"
 #include "dc.h"
drivers/gpu/drm/amd/display/dc/core/dc.c +2 -0
index 18c775a950cc..03dec40de361 100644
@@ -22,6 +22,8 @@
  * Authors: AMD
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "dc.h"
drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c +2 -0
index f02092a0dc76..eecc631ca4f8 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dm_helpers.h"
 #include "gpio_service_interface.h"
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +3 -0
index eac7186e4f08..5ad1c62e9e4d 100644
@@ -22,6 +22,9 @@
  * Authors: AMD
  *
  */
+
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "resource.h"
drivers/gpu/drm/amd/display/dc/core/dc_sink.c +2 -0
index 9971b515c3eb..5cbfdf1c4b11 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dm_helpers.h"
 #include "core_types.h"
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +1 -0
index 1dc3492f02a1..7a46cc4414d2 100644
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "dm_services.h"
 #include "dc.h"
drivers/gpu/drm/amd/display/dc/core/dc_surface.c +2 -0
index a5e86f9b148f..87b3b03c3556 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/mm.h>
+
 /* DC interface (public) */
 #include "dm_services.h"
 #include "dc.h"
drivers/gpu/drm/amd/display/dc/dce/dce_audio.c +2 -0
index 7f6d724686f1..9b078a71de2e 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "reg_helper.h"
 #include "dce_audio.h"
 #include "dce/dce_11_0_d.h"
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +1 -0
index 0863719b0c85..f2295e780031 100644
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "dm_services.h"
 #include "core_types.h"
drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c +2 -0
index 963686380738..29d69dfc9848 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dce_clk_mgr.h"
 
 #include "reg_helper.h"
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +2 -0
index f70437aae8e0..58864fca3da7 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 
drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c +1 -0
index a8c2cf260c84..9c701ab2dbfd 100644
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "core_types.h"
 #include "link_encoder.h"
drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c +2 -0
index 5d9506b3d46b..ce30dbf579d4 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dce_ipp.h"
 #include "reg_helper.h"
 #include "dm_services.h"
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +1 -0
index 1037d2a72f3f..8527cce81c6f 100644
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "reg_helper.h"
 
drivers/gpu/drm/amd/display/dc/dce/dce_opp.c +2 -0
index 87093894ea9e..51081d9ae3fb 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "basics/conversion.h"
 
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +3 -0
index e938bf9986d3..870bda57dc29 100644
@@ -22,6 +22,9 @@
  * Authors: AMD
  *
  */
+
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "link_encoder.h"
drivers/gpu/drm/amd/display/dc/dce110/dce110_compressor.c +1 -0
index 12083bb8ef02..72b580a4eb85 100644
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "dm_services.h"
 
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +2 -0
index dcd04e9ea76b..4d9f219738bb 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "link_encoder.h"
drivers/gpu/drm/amd/display/dc/dce112/dce112_compressor.c +1 -0
index f9819df1d3e2..51cb45d8b9ab 100644
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "dm_services.h"
 
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +2 -0
index a480b15f6885..1bfff440e807 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "link_encoder.h"
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +2 -0
index 6d49c7143c67..c2fae5150bcc 100644
@@ -24,6 +24,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +2 -0
index 27d0cc394963..83c4cc8516c1 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dce/dce_8_0_d.h"
 #include "dce/dce_8_0_sh_mask.h"
 
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c +2 -0
index 2b2de1d913c9..98028fbf67f1 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dcn10_clk_mgr.h"
 
 #include "reg_helper.h"
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_ipp.c +2 -0
index 08db1e6b5166..0e0c6850247d 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dcn10_ipp.h"
 #include "reg_helper.h"
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c +1 -0
index 102d968a8cd3..0df729492db3 100644
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "reg_helper.h"
 
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c +2 -0
index ab958cff3b76..cec69cecf521 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dcn10_opp.h"
 #include "reg_helper.h"
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +2 -0
index 7eccb54c421d..6b97d45c6ebf 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dc.h"
 
drivers/gpu/drm/amd/display/dc/gpio/gpio_base.c +2 -0
index cf76ea2d9f5a..d03b38e80d9b 100644
@@ -27,6 +27,8 @@
  * Pre-requisites: headers required by header of this unit
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/gpio_interface.h"
drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c +2 -0
index 3c63a3c04dbb..a7fab44f66b6 100644
@@ -27,6 +27,8 @@
  * Pre-requisites: headers required by header of this unit
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "include/gpio_interface.h"
 #include "include/gpio_service_interface.h"
drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c +1 -0
index 8ebeabad7bb7..240cdd8d9689 100644
@@ -24,6 +24,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "dm_services.h"
 
drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c +2 -0
index c2028c4744a6..a97972ebd4b7 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 /*
drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c +2 -0
index 784feccc5853..5e11d748e6f3 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/gpio_types.h"
drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c +2 -0
index 86987f5e8bd5..1a581c464345 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/logger_interface.h"
drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c +2 -0
index 750ba0ab4106..15380336cb51 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/logger_interface.h"
drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c +2 -0
index de218fe84a43..281fee8ad1e5 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/logger_interface.h"
drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c +2 -0
index 10ac6deff5ff..ebf483e3f098 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/logger_interface.h"
drivers/gpu/drm/amd/display/dc/irq/irq_service.c +2 -0
index 604bea01fc13..0878550a8178 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "include/irq_service_interface.h"
drivers/gpu/drm/amd/display/dc/os_types.h +5 -3
index c0d9f332baed..30ec80ac6fc8 100644
@@ -26,11 +26,13 @@
 #ifndef _OS_TYPES_H_
 #define _OS_TYPES_H_
 
-#include <asm/byteorder.h>
+#include <linux/kgdb.h>
+#include <linux/kref.h>
 #include <linux/types.h>
-#include <drm/drmP.h>
 
-#include <linux/kref.h>
+#include <asm/byteorder.h>
+
+#include <drm/drm_print.h>
 
 #include "cgs_common.h"
 
drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c +2 -0
index 1c079ba37c30..3464b2d5b89a 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dm_services_types.h"
 
drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c +2 -0
index fdcf9e66d852..484047155aae 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "virtual_stream_encoder.h"
 
drivers/gpu/drm/amd/display/modules/color/color_gamma.c +3 -0
index a1055413bade..67001fca688b 100644
@@ -23,6 +23,9 @@
  *
  */
 
+#include <linux/mm.h>
+#include <linux/slab.h>
+
 #include "dc.h"
 #include "opp.h"
 #include "color_gamma.h"
drivers/gpu/drm/amd/display/modules/freesync/freesync.c +2 -0
index 19b1eaebe484..7c20171a3b6d 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "dc.h"
 #include "mod_freesync.h"
Signature · 6 lines
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#10 lore raw

PATCH 5/10 drm/amd: drop use of drmP.h in atom.h

In reply to a message not in the archive

Drop use of the deprecated drmP.h header from atom.h

Fix fallout in various files.

Cc Alex Deucher <[email protected]>
Cc "Christian König" <[email protected]>
Cc "David (ChunMing) Zhou" <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c           | 1 +
 drivers/gpu/drm/amd/amdgpu/atom.h                 | 3 ++-
 drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 2 ++
 drivers/gpu/drm/amd/display/dc/core/dc_link.c     | 2 ++
 drivers/gpu/drm/amd/display/dc/dce/dce_abm.c      | 2 ++
 drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c  | 3 +++
 drivers/gpu/drm/amd/powerplay/smu_v11_0.c         | 4 +++-
 7 files changed, 15 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c +1 -0
index 0a4fba196b84..eba42c752bca 100644
@@ -24,6 +24,7 @@
  */
 
 #include <linux/irqdomain.h>
+#include <linux/pci.h>
 #include <linux/pm_domain.h>
 #include <linux/platform_device.h>
 #include <sound/designware_i2s.h>
drivers/gpu/drm/amd/amdgpu/atom.h +2 -1
index a39170991afe..4205bbe5d8d7 100644
@@ -26,7 +26,8 @@
 #define ATOM_H
 
 #include <linux/types.h>
-#include <drm/drmP.h>
+
+struct drm_device;
 
 #define ATOM_BIOS_MAGIC		0xAA55
 #define ATOM_ATI_MAGIC_PTR	0x30
drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +2 -0
index a4c97d32e751..461eef1de124 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 
 #include "atom.h"
drivers/gpu/drm/amd/display/dc/core/dc_link.c +2 -0
index b37ecc3ede61..bcb20e71b920 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dm_services.h"
 #include "atom.h"
 #include "dm_helpers.h"
drivers/gpu/drm/amd/display/dc/dce/dce_abm.c +2 -0
index da96229db53a..dbd8cc600127 100644
@@ -23,6 +23,8 @@
  *
  */
 
+#include <linux/slab.h>
+
 #include "dce_abm.h"
 #include "dm_services.h"
 #include "reg_helper.h"
drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c +3 -0
index 101c09b212ad..d09690fca452 100644
@@ -20,6 +20,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+
+#include <linux/pci.h>
+
 #include "hwmgr.h"
 #include "pp_debug.h"
 #include "ppatomctrl.h"
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +3 -1
index 92903a4cc4d8..d5d317f17c28 100644
@@ -20,8 +20,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "pp_debug.h"
 #include <linux/firmware.h>
+#include <linux/module.h>
+
+#include "pp_debug.h"
 #include "amdgpu.h"
 #include "amdgpu_smu.h"
 #include "atomfirmware.h"
Signature · 6 lines
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#11 lore raw

PATCH 6/10 drm/amd: drop use of drmP.h from all header files

In reply to a message not in the archive

Drop use of the deprecated drmP.h header file from all amd header files.
This makes it a more smooth process to get rid of drmP.h in the .c files.

Added include files and forwards as appropriate.

Cc Alex Deucher <[email protected]>
Cc "Christian König" <[email protected]>
Cc "David (ChunMing) Zhou" <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h         | 5 ++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h         | 2 --
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h +4 -1
index 2a1a0c734bdd..12299fd95691 100644
@@ -25,7 +25,10 @@
 #ifndef __AMDGPU_SCHED_H__
 #define __AMDGPU_SCHED_H__
 
-#include <drm/drmP.h>
+enum drm_sched_priority;
+
+struct drm_device;
+struct drm_file;
 
 enum drm_sched_priority amdgpu_to_sched_priority(int amdgpu_priority);
 int amdgpu_sched_ioctl(struct drm_device *dev, void *data,
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +0 -2
index d3ca2424b5fe..77674a7b9616 100644
@@ -28,8 +28,6 @@
 #include <linux/types.h>
 #include <linux/tracepoint.h>
 
-#include <drm/drmP.h>
-
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM amdgpu
 #define TRACE_INCLUDE_FILE amdgpu_trace
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +4 -1
index 978ff14a7d45..2485d8426e5e 100644
@@ -26,8 +26,11 @@
 #ifndef __AMDGPU_DM_H__
 #define __AMDGPU_DM_H__
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
+#include <drm/drm_connector.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_dp_mst_helper.h>
+#include <drm/drm_plane.h>
 
 /*
  * This file contains the definition for amdgpu_display_manager
Signature · 6 lines
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#12 lore raw

PATCH 7/10 drm/amd: drop use of drmP.h in powerplay/

In reply to a message not in the archive

Delete the only include of drmP.h in powerplay/.

Cc Alex Deucher <[email protected]>
Cc "Christian König" <[email protected]>
Cc "David (ChunMing) Zhou" <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +2 -2
index eec329ab6037..a4c9d9267f8e 100644
@@ -20,9 +20,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "pp_debug.h"
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+
+#include "pp_debug.h"
 #include "amdgpu.h"
 #include "amdgpu_smu.h"
 #include "soc15_common.h"
Signature · 6 lines
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#13 lore raw

PATCH 8/10 drm/amd: drop use of drmP.h in display/

In reply to a message not in the archive

Drop all uses of drmP.h in drm/amd/display/. Fix fallout.

Cc Alex Deucher <[email protected]>
Cc "Christian König" <[email protected]>
Cc "David (ChunMing) Zhou" <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c          | 4 +++-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c  | 1 -
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c      | 2 --
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c   | 1 -
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -1
index 443b13ec268d..3a723e553a19 100644
@@ -53,15 +53,17 @@
 #include <linux/version.h>
 #include <linux/types.h>
 #include <linux/pm_runtime.h>
+#include <linux/pci.h>
 #include <linux/firmware.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_uapi.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_dp_mst_helper.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_edid.h>
+#include <drm/drm_vblank.h>
 
 #if defined(CONFIG_DRM_AMD_DC_DCN1_0)
 #include "ivsrcid/irqsrcs_dcn_1_0.h"
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -1
index e6cd67342df8..97b2c3b16bef 100644
@@ -28,7 +28,6 @@
 #include <linux/version.h>
 #include <linux/i2c.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/amdgpu_drm.h>
 #include <drm/drm_edid.h>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +0 -2
index fd22b4474dbf..1b59d3d42f7b 100644
@@ -23,8 +23,6 @@
  *
  */
 
-#include <drm/drmP.h>
-
 #include "dm_services_types.h"
 #include "dc.h"
 
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +0 -1
index 350e7a620d45..b37e8c9653e1 100644
@@ -24,7 +24,6 @@
 #include <linux/string.h>
 #include <linux/acpi.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/amdgpu_drm.h>
 #include "dm_services.h"
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c +0 -1
index d915e8c8769b..022da5d45d4d 100644
@@ -26,7 +26,6 @@
 #include <linux/string.h>
 #include <linux/acpi.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/amdgpu_drm.h>
 #include "dm_services.h"
Signature · 6 lines
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#14 lore raw

PATCH 10/10 drm/amd: drop use of drmP.h in remaining files

In reply to a message not in the archive

With this commit drm/amd/ has no longer any uses of the deprecated drmP.h header file.

Cc Alex Deucher <[email protected]>
Cc "Christian König" <[email protected]>
Cc "David (ChunMing) Zhou" <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 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          | 4 +++-
 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_v7_0.c          | 4 +++-
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c          | 3 ++-
 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c          | 3 ++-
 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/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_v3_1.c          | 4 +++-
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c         | 2 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c         | 2 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c         | 5 +++--
 drivers/gpu/drm/amd/amdgpu/si.c                | 3 ++-
 drivers/gpu/drm/amd/amdgpu/si_dma.c            | 2 +-
 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          | 2 +-
 drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c          | 2 +-
 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c          | 2 +-
 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c          | 2 +-
 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 +++-
 43 files changed, 99 insertions(+), 44 deletions(-)
drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +1 -1
index 8a0818b23ea4..213e62a28ba0 100644
@@ -23,7 +23,7 @@
  * Authors: Dave Airlie
  *          Alex Deucher
  */
-#include <drm/drmP.h>
+
 #include <drm/drm_crtc_helper.h>
 #include <drm/amdgpu_drm.h>
 #include <drm/drm_fixed.h>
drivers/gpu/drm/amd/amdgpu/atombios_dp.c +1 -1
index f81068ba4cc6..6858cde9fc5d 100644
@@ -24,7 +24,7 @@
  *          Alex Deucher
  *          Jerome Glisse
  */
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 
drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +3 -1
index 60e2447e12c5..1e94a9b652f7 100644
@@ -23,7 +23,9 @@
  * Authors: Dave Airlie
  *          Alex Deucher
  */
-#include <drm/drmP.h>
+
+#include <linux/pci.h>
+
 #include <drm/drm_crtc_helper.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
drivers/gpu/drm/amd/amdgpu/atombios_i2c.c +1 -1
index f9b2ce9a98f3..980c363b1a0a 100644
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  *
  */
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 #include "atom.h"
drivers/gpu/drm/amd/amdgpu/cik.c +2 -1
index 07c1f239e9c3..a316ce8eec98 100644
@@ -24,7 +24,8 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <drm/drmP.h>
+#include <linux/pci.h>
+
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_ih.h"
drivers/gpu/drm/amd/amdgpu/cik_ih.c +3 -1
index 721c757156e8..401c99f0b2d0 100644
@@ -20,7 +20,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
+#include <linux/pci.h>
+
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "cikd.h"
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +3 -1
index 063057ca18be..c45304f1047c 100644
@@ -21,8 +21,10 @@
  *
  * Authors: Alex Deucher
  */
+
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+#include <linux/module.h>
+
 #include "amdgpu.h"
 #include "amdgpu_ucode.h"
 #include "amdgpu_trace.h"
drivers/gpu/drm/amd/amdgpu/cz_ih.c +3 -1
index 61024b9c7a4b..1dca0cabc326 100644
@@ -20,7 +20,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
+#include <linux/pci.h>
+
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "vid.h"
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +4 -1
index 1f0426d2fc2a..1ffd1963e765 100644
@@ -20,7 +20,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
+#include <drm/drm_fourcc.h>
+#include <drm/drm_vblank.h>
+
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +4 -1
index 2280b971d758..9e0782b54066 100644
@@ -20,7 +20,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
+#include <drm/drm_fourcc.h>
+#include <drm/drm_vblank.h>
+
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +6 -1
index bea32f076b91..4bf453e07dca 100644
@@ -20,7 +20,12 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
+#include <linux/pci.h>
+
+#include <drm/drm_fourcc.h>
+#include <drm/drm_vblank.h>
+
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +4 -1
index 13da915991dd..b23418ca8f6a 100644
@@ -20,7 +20,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
+#include <drm/drm_fourcc.h>
+#include <drm/drm_vblank.h>
+
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +3 -1
index e4cc1d48eaab..3026298da7eb 100644
@@ -20,7 +20,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
+#include <drm/drm_vblank.h>
+
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_i2c.h"
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +3 -1
index a61325ede1f8..9642381ec9a2 100644
@@ -20,8 +20,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+#include <linux/module.h>
+
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "amdgpu_gfx.h"
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2 -1
index 775f6bd4fff6..812a8597c09d 100644
@@ -24,8 +24,9 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/firmware.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 
-#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_gfx.h"
 #include "vi.h"
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -1
index f35c1122f12b..08d1c134d125 100644
@@ -24,8 +24,9 @@
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/firmware.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 
-#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_gfx.h"
 #include "soc15.h"
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +4 -1
index b06d876da2d9..ca8dbe91cc8b 100644
@@ -20,8 +20,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+
 #include <drm/drm_cache.h>
 #include "amdgpu.h"
 #include "gmc_v6_0.h"
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +4 -1
index 75aa3332aee2..57f80065d57a 100644
@@ -20,8 +20,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+
 #include <drm/drm_cache.h>
 #include "amdgpu.h"
 #include "cikd.h"
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +4 -1
index 8a3b5e6fc6c9..c0e25583f987 100644
@@ -20,8 +20,11 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+
 #include <drm/drm_cache.h>
 #include "amdgpu.h"
 #include "gmc_v8_0.h"
drivers/gpu/drm/amd/amdgpu/iceland_ih.c +3 -1
index b1626e1d2f5d..a13dd9a51149 100644
@@ -20,7 +20,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
+#include <linux/pci.h>
+
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "vid.h"
drivers/gpu/drm/amd/amdgpu/kv_dpm.c +1 -1
index f2e6b148ccad..f965e40d38bf 100644
@@ -21,7 +21,7 @@
  *
  */
 
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "cikd.h"
drivers/gpu/drm/amd/amdgpu/kv_smc.c +1 -1
index b82e33c01571..1cfd7477cc1c 100644
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "cikd.h"
 #include "kv_dpm.h"
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +3 -1
index 143f0fae69d5..5f531a7db257 100644
@@ -24,7 +24,9 @@
  */
 
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+
 #include "amdgpu.h"
 #include "amdgpu_psp.h"
 #include "amdgpu_ucode.h"
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +1 -1
index bd7c8f5cd0e7..a10175838013 100644
@@ -24,8 +24,8 @@
 
 #include <linux/delay.h>
 #include <linux/firmware.h>
+#include <linux/module.h>
 
-#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ucode.h"
 #include "amdgpu_trace.h"
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +1 -1
index 346e1910641d..5f4e2c616241 100644
@@ -24,8 +24,8 @@
 
 #include <linux/delay.h>
 #include <linux/firmware.h>
+#include <linux/module.h>
 
-#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ucode.h"
 #include "amdgpu_trace.h"
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +3 -2
index 08e0f81b87b5..d212011c40af 100644
@@ -21,10 +21,11 @@
  *
  */
 
-#include <linux/firmware.h>
 #include <linux/delay.h>
+#include <linux/firmware.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 
-#include <drm/drmP.h>
 #include "amdgpu.h"
 #include "amdgpu_ucode.h"
 #include "amdgpu_trace.h"
drivers/gpu/drm/amd/amdgpu/si.c +2 -1
index 9d8df68893b9..b7034befe311 100644
@@ -24,7 +24,8 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <drm/drmP.h>
+#include <linux/pci.h>
+
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_ih.h"
drivers/gpu/drm/amd/amdgpu/si_dma.c +1 -1
index 1108eb66277d..bdda8b4e03f0 100644
@@ -21,7 +21,7 @@
  *
  * Authors: Alex Deucher
  */
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_trace.h"
 #include "si.h"
drivers/gpu/drm/amd/amdgpu/si_dpm.c +3 -1
index d57e75e5c71f..4cb4c891120b 100644
@@ -21,7 +21,9 @@
  *
  */
 
-#include <drm/drmP.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
 #include "amdgpu_dpm.h"
drivers/gpu/drm/amd/amdgpu/si_ih.c +3 -1
index 8c50c9cab455..57bb5f9e08b2 100644
@@ -20,7 +20,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
+#include <linux/pci.h>
+
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "sid.h"
drivers/gpu/drm/amd/amdgpu/si_smc.c +1 -1
index 4a2fd8b61940..8f994ffa9cd1 100644
@@ -23,7 +23,7 @@
  */
 
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "sid.h"
 #include "ppsmc.h"
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -1
index b7e594c2bfb4..ede0619a6297 100644
@@ -23,7 +23,8 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <drm/drmP.h>
+#include <linux/pci.h>
+
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_ih.h"
drivers/gpu/drm/amd/amdgpu/tonga_ih.c +3 -1
index a20b711a6756..e40140bf6699 100644
@@ -20,7 +20,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
+#include <linux/pci.h>
+
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "vid.h"
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +1 -1
index 037606a5f185..70a1ecd5ce50 100644
@@ -23,7 +23,7 @@
  */
 
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_uvd.h"
 #include "cikd.h"
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +1 -1
index c88aa2d6a2b5..597605604fb9 100644
@@ -25,7 +25,7 @@
 #include <linux/delay.h>
 #include <linux/firmware.h>
 
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_uvd.h"
 #include "vid.h"
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1 -1
index 50af37d08b91..bc25226f04c1 100644
@@ -23,7 +23,7 @@
  */
 
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_uvd.h"
 #include "vid.h"
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +1 -1
index e36b69945ea2..9945c43bc0c5 100644
@@ -22,7 +22,7 @@
  */
 
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_uvd.h"
 #include "soc15.h"
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1 -1
index 40363ca6c5f1..05b67bf0e7a2 100644
@@ -26,7 +26,7 @@
  */
 
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_vce.h"
 #include "cikd.h"
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +1 -1
index 6ec65cf11112..ff3f8635d719 100644
@@ -26,7 +26,7 @@
  */
 
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_vce.h"
 #include "vid.h"
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +1 -1
index c0ec27991c22..5fe8ab04bf91 100644
@@ -25,7 +25,7 @@
  */
 
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_vce.h"
 #include "soc15.h"
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +1 -1
index 3dbc51f9d3b9..1f92dec6b884 100644
@@ -22,7 +22,7 @@
  */
 
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_vcn.h"
 #include "soc15.h"
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +3 -1
index 8d89ab7f0ae8..266799fb0af4 100644
@@ -20,7 +20,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
+#include <linux/pci.h>
+
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "soc15.h"
drivers/gpu/drm/amd/amdgpu/vi.c +3 -1
index 5e5b42a0744a..87c461744873 100644
@@ -20,8 +20,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+
+#include <linux/pci.h>
 #include <linux/slab.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_ih.h"
Signature · 6 lines
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#15 lore raw

PATCH 4/10 drm/amd: drop use of drmP.h in amdgpu.h

In reply to Sam Ravnborg

Delete the unused drmP.h from amdgpu.h. Fix fallout in various files.

Cc Alex Deucher <[email protected]>
Cc "Christian König" <[email protected]>
Cc "David (ChunMing) Zhou" <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                          | 4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c                      | 2 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c                    | 3 +++
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c                     | 4 ++++
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c                        | 2 ++
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c                        | 4 ++++
 drivers/gpu/drm/amd/amdgpu/psp_v10_0.c                       | 3 +++
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c                       | 2 ++
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c        | 1 +
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c    | 4 +++-
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c             | 1 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c           | 1 +
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_processpptables.c | 1 +
 drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c             | 1 +
 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c        | 1 +
 drivers/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 ++
 19 files changed, 38 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -2
index 14398f55f602..fbec83bfb4ad 100644
@@ -44,9 +44,9 @@
 #include <drm/ttm/ttm_module.h>
 #include <drm/ttm/ttm_execbuf_util.h>
 
-#include <drm/drmP.h>
-#include <drm/drm_gem.h>
 #include <drm/amdgpu_drm.h>
+#include <drm/drm_gem.h>
+#include <drm/drm_ioctl.h>
 #include <drm/gpu_scheduler.h>
 
 #include <kgd_kfd_interface.h>
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +2 -0
index 22bd21efe6b1..4fea7f835506 100644
@@ -24,6 +24,8 @@
 #include <linux/debugfs.h>
 #include <linux/list.h>
 #include <linux/module.h>
+#include <linux/uaccess.h>
+
 #include "amdgpu.h"
 #include "amdgpu_ras.h"
 #include "amdgpu_atomfirmware.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c +3 -0
index 639297250c21..c799691dfa84 100644
@@ -23,8 +23,11 @@
  */
 
 #include <linux/fdtable.h>
+#include <linux/file.h>
 #include <linux/pid.h>
+
 #include <drm/amdgpu_drm.h>
+
 #include "amdgpu.h"
 
 #include "amdgpu_vm.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +4 -0
index 7d484fad3909..01f88269a7f9 100644
@@ -21,6 +21,10 @@
  *
  */
 
+#include <linux/module.h>
+
+#include <drm/drm_drv.h>
+
 #include "amdgpu.h"
 
 bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
index 4f761ebb655e..91f10995249b 100644
@@ -21,6 +21,8 @@
  *
  */
 #include <linux/firmware.h>
+#include <linux/module.h>
+
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 #include "amdgpu_gfx.h"
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +4 -0
index 3b7370d914a5..51bbf773b4f5 100644
@@ -20,8 +20,12 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+
 #include <linux/firmware.h>
+#include <linux/pci.h>
+
 #include <drm/drm_cache.h>
+
 #include "amdgpu.h"
 #include "gmc_v9_0.h"
 #include "amdgpu_atomfirmware.h"
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +3 -0
index 77c2bc344dfc..ce1ea31feee0 100644
@@ -24,6 +24,9 @@
  */
 
 #include <linux/firmware.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+
 #include "amdgpu.h"
 #include "amdgpu_psp.h"
 #include "amdgpu_ucode.h"
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +2 -0
index b91df7bd1d98..b1e7aca72578 100644
@@ -21,6 +21,8 @@
  */
 
 #include <linux/firmware.h>
+#include <linux/module.h>
+
 #include "amdgpu.h"
 #include "amdgpu_psp.h"
 #include "amdgpu_ucode.h"
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c +1 -0
index a10e3a50d9ef..bc67e6502733 100644
@@ -24,6 +24,7 @@
  */
 
 #include <drm/drm_crtc.h>
+#include <drm/drm_vblank.h>
 
 #include "amdgpu.h"
 #include "amdgpu_dm.h"
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +3 -1
index 1d5fc5ad3bee..e611b5376d8c 100644
@@ -23,7 +23,9 @@
  *
  */
 
-#include <linux/debugfs.h>
+#include <linux/uaccess.h>
+
+#include <drm/drm_debugfs.h>
 
 #include "dc.h"
 #include "amdgpu.h"
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1 -0
index 048757e8f494..8f81c25c523d 100644
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/module.h>
+#include <linux/pci.h>
 #include <linux/slab.h>
 #include <asm/div64.h>
 #include <drm/amdgpu_drm.h>
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1 -0
index 384c37875cd0..8e05c14d2d0d 100644
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/fb.h>
 #include <linux/module.h>
+#include <linux/pci.h>
 #include <linux/slab.h>
 
 #include "hwmgr.h"
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_processpptables.c +1 -0
index b6767d74dc85..b12100de3084 100644
@@ -21,6 +21,7 @@
  *
  */
 #include <linux/module.h>
+#include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/fb.h>
 
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +1 -0
index 669bd0c2a16c..46858b901d05 100644
@@ -25,6 +25,7 @@
 #include <linux/fb.h>
 #include "linux/delay.h"
 #include <linux/types.h>
+#include <linux/pci.h>
 
 #include "smumgr.h"
 #include "pp_debug.h"
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +1 -0
index 375ccf6ff5f2..0eee7b2f8b9a 100644
@@ -25,6 +25,7 @@
 #include "pp_debug.h"
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/gfp.h>
 
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +2 -0
index 2d4cfe14f72e..477c1c870591 100644
@@ -21,6 +21,8 @@
  *
  */
 
+#include <linux/pci.h>
+
 #include "pp_debug.h"
 #include "smumgr.h"
 #include "smu74.h"
drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c +2 -0
index 6d11076a79ba..d409925d1f7d 100644
@@ -21,6 +21,8 @@
  *
  */
 
+#include <linux/pci.h>
+
 #include "smumgr.h"
 #include "smu10_inc.h"
 #include "soc15_common.h"
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +1 -0
index 3ed6c5f1e5cf..8f6f2808094a 100644
@@ -23,6 +23,7 @@
 #include "pp_debug.h"
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/gfp.h>
 
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +2 -0
index c81acc3192ad..672986e9eecb 100644
@@ -21,6 +21,8 @@
  *
  */
 
+#include <linux/pci.h>
+
 #include "smumgr.h"
 #include "vega10_inc.h"
 #include "soc15_common.h"
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#16 lore raw

PATCH 9/10 drm/amd: drop use of drmP.h in amdgpu/amdgpu*

In reply to Sam Ravnborg

Drop use of drmP.h in all files named amdgpu* in drm/amd/amdgpu/

Fix fallout.

Cc Alex Deucher <[email protected]>
Cc "Christian König" <[email protected]>
Cc "David (ChunMing) Zhou" <[email protected]>
Cc David Airlie <[email protected]>
Cc Daniel Vetter <[email protected]>
---
 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  |  2 +-
 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_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_ring.c          |  3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c            |  2 +-
 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_points.c  |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c           |  5 +++--
 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           |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c           |  3 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c            |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c      |  2 +-
 55 files changed, 103 insertions(+), 63 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +1 -1
index 56f8ca2a3bb4..1e41367ef74e 100644
@@ -27,7 +27,7 @@
 #include <linux/power_supply.h>
 #include <linux/pm_runtime.h>
 #include <acpi/video.h>
-#include <drm/drmP.h>
+
 #include <drm/drm_crtc_helper.h>
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c +1 -1
index 3889486f71fe..a4d65973bf7c 100644
@@ -25,7 +25,7 @@
  */
 #include <linux/hdmi.h>
 #include <linux/gcd.h>
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +1 -1
index aeead072fa79..822049a78e9f 100644
@@ -22,7 +22,7 @@
 
 #include "amdgpu_amdkfd.h"
 #include "amd_shared.h"
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_gfx.h"
 #include <linux/module.h>
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +1 -1
index fa09e11a600c..c49d5ae4e29e 100644
@@ -23,7 +23,7 @@
 #include <linux/fdtable.h>
 #include <linux/uaccess.h>
 #include <linux/mmu_context.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_amdkfd.h"
 #include "cikd.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +1 -1
index fec3a6aa1de6..68f4b1315740 100644
@@ -24,7 +24,7 @@
 #include <linux/fdtable.h>
 #include <linux/uaccess.h>
 #include <linux/mmu_context.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_amdkfd.h"
 #include "gfx_v8_0.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +1 -1
index ef3d93b995b2..1a3ec47238b0 100644
@@ -26,7 +26,7 @@
 #include <linux/fdtable.h>
 #include <linux/uaccess.h>
 #include <linux/mmu_context.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_amdkfd.h"
 #include "soc15_hw_ip.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +1 -1
index d2b51bc3f534..2510dc93b600 100644
@@ -28,7 +28,7 @@
 #include <linux/sched/mm.h>
 #include <linux/sched/task.h>
 
-#include <drm/drmP.h>
+
 #include "amdgpu_object.h"
 #include "amdgpu_vm.h"
 #include "amdgpu_amdkfd.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +1 -1
index e02781b37e73..1c9d40f97a9b 100644
@@ -23,7 +23,7 @@
  * Authors: Dave Airlie
  *          Alex Deucher
  */
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +1 -1
index f96d75c6e099..a2dbdf13c4c7 100644
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 #include "atomfirmware.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c +1 -1
index 3079ea8523c5..649e68c4479b 100644
@@ -21,7 +21,7 @@
  *
  * Authors: Jerome Glisse
  */
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 
drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +2 -1
index a5df80d50d44..50dff69a0f6e 100644
@@ -25,10 +25,11 @@
  *          Alex Deucher
  *          Jerome Glisse
  */
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "atom.h"
 
+#include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/acpi.h>
 /*
drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c +2 -1
index 5c79da8e1150..7d2f37434c1a 100644
@@ -28,7 +28,8 @@
  *    Christian König <[email protected]>
  */
 
-#include <drm/drmP.h>
+#include <linux/uaccess.h>
+
 #include "amdgpu.h"
 #include "amdgpu_trace.h"
 
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +2 -1
index 387f1cf1dc20..031b094607bd 100644
@@ -22,8 +22,9 @@
  *
  */
 #include <linux/list.h>
+#include <linux/pci.h>
 #include <linux/slab.h>
-#include <drm/drmP.h>
+
 #include <linux/firmware.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +1 -1
index bf04c12bd324..73b2ede773d3 100644
@@ -23,7 +23,7 @@
  * Authors: Dave Airlie
  *          Alex Deucher
  */
-#include <drm/drmP.h>
+
 #include <drm/drm_edid.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_probe_helper.h>
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +3 -1
index 2f6239b6be6f..7cd24c1d7919 100644
@@ -24,9 +24,11 @@
  * Authors:
  *    Jerome Glisse <[email protected]>
  */
+
+#include <linux/file.h>
 #include <linux/pagemap.h>
 #include <linux/sync_file.h>
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include <drm/drm_syncobj.h>
 #include "amdgpu.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +1 -1
index a28a3d722ba2..6373f15deba4 100644
@@ -22,7 +22,7 @@
  * Authors: monk liu <[email protected]>
  */
 
-#include <drm/drmP.h>
+
 #include <drm/drm_auth.h>
 #include "amdgpu.h"
 #include "amdgpu_sched.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +5 -2
index 8930d66f2204..f255a00c4492 100644
@@ -24,8 +24,11 @@
  */
 
 #include <linux/kthread.h>
-#include <drm/drmP.h>
-#include <linux/debugfs.h>
+#include <linux/pci.h>
+#include <linux/uaccess.h>
+
+#include <drm/drm_debugfs.h>
+
 #include "amdgpu.h"
 
 /**
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -1
index 9f282e971197..aa423887943f 100644
@@ -27,9 +27,10 @@
  */
 #include <linux/power_supply.h>
 #include <linux/kthread.h>
+#include <linux/module.h>
 #include <linux/console.h>
 #include <linux/slab.h>
-#include <drm/drmP.h>
+
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/amdgpu_drm.h>
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +3 -1
index b083b219b1a9..6a15f85086c1 100644
@@ -23,7 +23,7 @@
  * Authors: Dave Airlie
  *          Alex Deucher
  */
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 #include "amdgpu_i2c.h"
@@ -32,11 +32,13 @@
 #include "amdgpu_display.h"
 #include <asm/div64.h>
 
+#include <linux/pci.h>
 #include <linux/pm_runtime.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_fb_helper.h>
+#include <drm/drm_vblank.h>
 
 static void amdgpu_display_flip_callback(struct dma_fence *f,
 					 struct dma_fence_cb *cb)
drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c +1 -1
index 523b8ab6b04e..59ada4a12ad1 100644
@@ -22,7 +22,7 @@
  * Authors: Alex Deucher
  */
 
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_i2c.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +4 -1
index 1e2cc9d68a05..6b72bdfe71e3 100644
@@ -22,14 +22,17 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_gem.h>
+#include <drm/drm_vblank.h>
 #include "amdgpu_drv.h"
 
 #include <drm/drm_pciids.h>
 #include <linux/console.h>
 #include <linux/module.h>
+#include <linux/pci.h>
 #include <linux/pm_runtime.h>
 #include <linux/vga_switcheroo.h>
 #include <drm/drm_probe_helper.h>
drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c +1 -1
index ec78e2b2015c..571a6dfb473e 100644
@@ -23,7 +23,7 @@
  * Authors: Dave Airlie
  *          Alex Deucher
  */
-#include <drm/drmP.h>
+
 #include <drm/drm_crtc_helper.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +7 -7
index 2e2869299a84..eb3569b46c1e 100644
@@ -23,22 +23,22 @@
  * Authors:
  *     David Airlie
  */
+
 #include <linux/module.h>
-#include <linux/slab.h>
 #include <linux/pm_runtime.h>
+#include <linux/slab.h>
+#include <linux/vga_switcheroo.h>
 
-#include <drm/drmP.h>
+#include <drm/amdgpu_drm.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
-#include <drm/amdgpu_drm.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
+
 #include "amdgpu.h"
 #include "cikd.h"
 #include "amdgpu_gem.h"
 
-#include <drm/drm_fb_helper.h>
-
-#include <linux/vga_switcheroo.h>
-
 #include "amdgpu_display.h"
 
 /* object hierarchy -
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +3 -1
index 4dee2326b29c..2d0d1c43c786 100644
@@ -34,7 +34,9 @@
 #include <linux/kref.h>
 #include <linux/slab.h>
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+
+#include <drm/drm_debugfs.h>
+
 #include "amdgpu.h"
 #include "amdgpu_trace.h"
 
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +4 -1
index 6d11e1721147..d79ab1da9e07 100644
@@ -25,7 +25,10 @@
  *          Alex Deucher
  *          Jerome Glisse
  */
-#include <drm/drmP.h>
+
+#include <linux/pci.h>
+#include <linux/vmalloc.h>
+
 #include <drm/amdgpu_drm.h>
 #ifdef CONFIG_X86
 #include <asm/set_memory.h>
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +5 -1
index d4fcf5475464..a806d403d29a 100644
@@ -26,9 +26,13 @@
  *          Jerome Glisse
  */
 #include <linux/ktime.h>
+#include <linux/module.h>
 #include <linux/pagemap.h>
-#include <drm/drmP.h>
+#include <linux/pci.h>
+
 #include <drm/amdgpu_drm.h>
+#include <drm/drm_debugfs.h>
+
 #include "amdgpu.h"
 #include "amdgpu_display.h"
 #include "amdgpu_xgmi.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1 -1
index 997932ebbb83..f198185c1fb6 100644
@@ -22,7 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_gfx.h"
 #include "amdgpu_rlc.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c +1 -1
index 62591d081856..9dba66922a58 100644
@@ -22,7 +22,7 @@
  * Authors: Christian König
  */
 
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 
 struct amdgpu_gtt_mgr {
drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c +2 -1
index f2739995c335..70dbe343f51d 100644
@@ -23,9 +23,10 @@
  * Authors: Dave Airlie
  *          Alex Deucher
  */
+
 #include <linux/export.h>
+#include <linux/pci.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_edid.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +3 -1
index fe393a46f881..c124e583bb91 100644
@@ -28,8 +28,10 @@
  */
 #include <linux/seq_file.h>
 #include <linux/slab.h>
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
+#include <drm/drm_debugfs.h>
+
 #include "amdgpu.h"
 #include "atom.h"
 #include "amdgpu_trace.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c +1 -1
index df9b173c3d0b..df6d33381f8b 100644
@@ -24,7 +24,7 @@
 
 #include <linux/idr.h>
 #include <linux/dma-fence-array.h>
-#include <drm/drmP.h>
+
 
 #include "amdgpu.h"
 #include "amdgpu_trace.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c +2 -1
index 934dfdcb4e73..6d8f05511aba 100644
@@ -21,7 +21,8 @@
  *
  */
 
-#include <drm/drmP.h>
+#include <linux/dma-mapping.h>
+
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
 
drivers/gpu/drm/amd/amdgpu/amdgpu_ioc32.c +2 -1
index 26482914dc4b..5cf142e849bb 100644
@@ -29,8 +29,9 @@
  */
 #include <linux/compat.h>
 
-#include <drm/drmP.h>
 #include <drm/amdgpu_drm.h>
+#include <drm/drm_ioctl.h>
+
 #include "amdgpu_drv.h"
 
 long amdgpu_kms_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +4 -1
index af4c3b1af322..2a3f5ec298db 100644
@@ -43,8 +43,11 @@
  */
 
 #include <linux/irq.h>
-#include <drm/drmP.h>
+#include <linux/pci.h>
+
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_irq.h>
+#include <drm/drm_vblank.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 #include "amdgpu_ih.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +1 -1
index 0a17fb1af204..7e9eafce8a35 100644
@@ -24,7 +24,7 @@
 #include <linux/kthread.h>
 #include <linux/wait.h>
 #include <linux/sched.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_trace.h"
 
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +4 -1
index b17d0545728e..ad7c4bef5797 100644
@@ -25,8 +25,9 @@
  *          Alex Deucher
  *          Jerome Glisse
  */
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
+#include <drm/drm_debugfs.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu_sched.h"
 #include "amdgpu_uvd.h"
@@ -35,6 +36,8 @@
 
 #include <linux/vga_switcheroo.h>
 #include <linux/slab.h>
+#include <linux/uaccess.h>
+#include <linux/pci.h>
 #include <linux/pm_runtime.h>
 #include "amdgpu_amdkfd.h"
 #include "amdgpu_gem.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +1 -1
index 58ed401c5996..19f8909e9647 100644
@@ -47,7 +47,7 @@
 #include <linux/module.h>
 #include <linux/mmu_notifier.h>
 #include <linux/interval_tree.h>
-#include <drm/drmP.h>
+
 #include <drm/drm.h>
 
 #include "amdgpu.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -1
index 93b2c5a48a71..16f96f2e3671 100644
@@ -31,7 +31,7 @@
  */
 #include <linux/list.h>
 #include <linux/slab.h>
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include <drm/drm_cache.h>
 #include "amdgpu.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c +1 -1
index 8e67c1210d7c..1f2305b7bd13 100644
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 #include "atom.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +4 -1
index 34471dbaa872..15b42f80ada2 100644
@@ -22,7 +22,9 @@
  * Authors: Rafał Miłecki <[email protected]>
  *          Alex Deucher <[email protected]>
  */
-#include <drm/drmP.h>
+
+#include <drm/drm_debugfs.h>
+
 #include "amdgpu.h"
 #include "amdgpu_drv.h"
 #include "amdgpu_pm.h"
@@ -31,6 +33,7 @@
 #include "amdgpu_smu.h"
 #include "atom.h"
 #include <linux/power_supply.h>
+#include <linux/pci.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/nospec.h>
drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c +1 -1
index a38e0fb4a6fe..b85b63ccaf37 100644
@@ -31,7 +31,7 @@
  * objects between different devices via PRIME <prime_buffer_sharing>`.
  */
 
-#include <drm/drmP.h>
+
 
 #include "amdgpu.h"
 #include "amdgpu_display.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 -1
index 86cc24b2e0aa..d72d603b55fc 100644
@@ -24,7 +24,7 @@
  */
 
 #include <linux/firmware.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_psp.h"
 #include "amdgpu_ucode.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +2 -1
index 8f5026c123ef..ee440fe29b91 100644
@@ -28,8 +28,9 @@
  */
 #include <linux/seq_file.h>
 #include <linux/slab.h>
+#include <linux/uaccess.h>
 #include <linux/debugfs.h>
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 #include "atom.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c +1 -1
index bfaf5c6323be..0bd1d4ffc19e 100644
@@ -41,7 +41,7 @@
  * If we are asked to block we wait on all the oldest fence of all
  * rings. We just wait for any of those fence to complete.
  */
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 
 static void amdgpu_sa_bo_remove_locked(struct amdgpu_sa_bo *sa_bo);
drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +1 -1
index 115bb0c99b0f..a425329d1897 100644
@@ -20,7 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_sdma.h"
 
drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +1 -1
index 2d6f5ec77a68..a5db36b09c47 100644
@@ -28,7 +28,7 @@
  *    Christian König <[email protected]>
  */
 
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_trace.h"
 #include "amdgpu_amdkfd.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_test.c +1 -1
index 8904e62dca7a..b66d29d5ffa2 100644
@@ -22,7 +22,7 @@
  *
  * Authors: Michel Dänzer
  */
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 #include "amdgpu_uvd.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c +1 -1
index f212402570a5..57c6c39ba064 100644
@@ -21,7 +21,7 @@
  *
  * Author : Dave Airlie <[email protected]>
  */
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +3 -2
index e9ede34dd875..a8a1fcab299b 100644
@@ -30,7 +30,7 @@
  *    Dave Airlie
  */
 
-#include <linux/debugfs.h>
+#include <linux/dma-mapping.h>
 #include <linux/iommu.h>
 #include <linux/pagemap.h>
 #include <linux/sched/task.h>
@@ -44,7 +44,8 @@
 #include <drm/ttm/ttm_placement.h>
 #include <drm/ttm/ttm_module.h>
 #include <drm/ttm/ttm_page_alloc.h>
-#include <drm/drmP.h>
+
+#include <drm/drm_debugfs.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 #include "amdgpu_object.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +1 -1
index 7b33867036e7..5228e8a49ec5 100644
@@ -24,7 +24,7 @@
 #include <linux/firmware.h>
 #include <linux/slab.h>
 #include <linux/module.h>
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 #include "amdgpu_ucode.h"
 
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +1 -1
index 4e5d13e41f6a..5b2fea3b4a2c 100644
@@ -30,7 +30,7 @@
 
 #include <linux/firmware.h>
 #include <linux/module.h>
-#include <drm/drmP.h>
+
 #include <drm/drm.h>
 
 #include "amdgpu.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +1 -1
index fa03081c2f78..aa222da24ecf 100644
@@ -27,7 +27,7 @@
 
 #include <linux/firmware.h>
 #include <linux/module.h>
-#include <drm/drmP.h>
+
 #include <drm/drm.h>
 
 #include "amdgpu.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +2 -1
index 7ed5d4e3884d..9501f8be8c75 100644
@@ -26,7 +26,8 @@
 
 #include <linux/firmware.h>
 #include <linux/module.h>
-#include <drm/drmP.h>
+#include <linux/pci.h>
+
 #include <drm/drm.h>
 
 #include "amdgpu.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
index 4f10f5aba00b..e44f9dd202e8 100644
@@ -28,7 +28,7 @@
 #include <linux/dma-fence-array.h>
 #include <linux/interval_tree_generic.h>
 #include <linux/idr.h>
-#include <drm/drmP.h>
+
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
 #include "amdgpu_trace.h"
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +1 -1
index ec9ea3fdbb4a..45bdf88dc82c 100644
@@ -22,7 +22,7 @@
  * Authors: Christian König
  */
 
-#include <drm/drmP.h>
+
 #include "amdgpu.h"
 
 struct amdgpu_vram_mgr {
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on the v1 series
#17 lore raw
In reply to Sam Ravnborg
Quoted 19 lines · Sam Ravnborg

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.

Quoted 7 lines

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.

Series is:

I'm fine to have this go through either drm-misc or my tree.

Alex

Quoted 207 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(-)
Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

A message that is not in the archive (sent off-list or not yet received): CADnq5_PtU+-FrTcOF9hkFYbqsSjAKmJkWReu-91pQH6mWoHtgw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#19 lore raw

Hi Alex.

Quoted 4 lines

Series is:

I'm fine to have this go through either drm-misc or my tree.

Thanks, pushed to drm-misc-next.
I ended up with a merge error in drm-tip that I dunno how to work with. Help would be appreciated.
(I also wrote this on irc)

It is getting late here, I hope someone has fixed it tomorrow morning.

Sam
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx