[PATCH V5 13/16] drm/amd/pm: relocate the power related headers

Lazar, Lijo lijo.lazar at amd.com
Wed Dec 22 13:51:10 UTC 2021



On 12/22/2021 10:53 AM, Quan, Evan wrote:
> [AMD Official Use Only]
> 
> 
> 
>> -----Original Message-----
>> From: Lazar, Lijo <Lijo.Lazar at amd.com>
>> Sent: Tuesday, December 21, 2021 2:22 PM
>> To: Quan, Evan <Evan.Quan at amd.com>; amd-gfx at lists.freedesktop.org
>> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
>> Subject: Re: [PATCH V5 13/16] drm/amd/pm: relocate the power related
>> headers
>>
>>
>>
>> On 12/13/2021 9:22 AM, Evan Quan wrote:
>>> Instead of centralizing all headers in the same folder. Separate them
>>> into different folders and place them among those source files those
>>> who really need them.
>>>
>>> Signed-off-by: Evan Quan <evan.quan at amd.com>
>>> Change-Id: Id74cb4c7006327ca7ecd22daf17321e417c4aa71
>>> --
>>> v1->v2:
>>>     - create separate holders for driver_if and ppsmc headers(Lijo)
>>> ---
>>>    drivers/gpu/drm/amd/pm/Makefile               | 12 ++++---
>>>    drivers/gpu/drm/amd/pm/legacy-dpm/Makefile    | 32
>> +++++++++++++++++++
>>>    .../pm/{powerplay => legacy-dpm}/cik_dpm.h    |  0
>>>    .../amd/pm/{powerplay => legacy-dpm}/kv_dpm.c |  0
>>>    .../amd/pm/{powerplay => legacy-dpm}/kv_dpm.h |  0
>>>    .../amd/pm/{powerplay => legacy-dpm}/kv_smc.c |  0
>>>    .../pm/{powerplay => legacy-dpm}/legacy_dpm.c |  0
>>>    .../pm/{powerplay => legacy-dpm}/legacy_dpm.h |  0
>>>    .../amd/pm/{powerplay => legacy-dpm}/ppsmc.h  |  0
>>>    .../pm/{powerplay => legacy-dpm}/r600_dpm.h   |  0
>>>    .../amd/pm/{powerplay => legacy-dpm}/si_dpm.c |  0
>>>    .../amd/pm/{powerplay => legacy-dpm}/si_dpm.h |  0
>>>    .../amd/pm/{powerplay => legacy-dpm}/si_smc.c |  0
>>>    .../{powerplay => legacy-dpm}/sislands_smc.h  |  0
>>>    drivers/gpu/drm/amd/pm/powerplay/Makefile     |  6 +---
>>>    .../pm/{ => powerplay}/inc/amd_powerplay.h    |  0
>>>    .../drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h |  0
>>>    .../amd/pm/{ => powerplay}/inc/fiji_ppsmc.h   |  0
>>>    .../pm/{ => powerplay}/inc/hardwaremanager.h  |  0
>>>    .../drm/amd/pm/{ => powerplay}/inc/hwmgr.h    |  0
>>>    .../{ => powerplay}/inc/polaris10_pwrvirus.h  |  0
>>>    .../amd/pm/{ => powerplay}/inc/power_state.h  |  0
>>>    .../drm/amd/pm/{ => powerplay}/inc/pp_debug.h |  0
>>>    .../amd/pm/{ => powerplay}/inc/pp_endian.h    |  0
>>>    .../amd/pm/{ => powerplay}/inc/pp_thermal.h   |  0
>>>    .../amd/pm/{ => powerplay}/inc/ppinterrupt.h  |  0
>>>    .../drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h |  0
>>>    .../drm/amd/pm/{ => powerplay}/inc/smu10.h    |  0
>>>    .../pm/{ => powerplay}/inc/smu10_driver_if.h  |  0
>>>    .../pm/{ => powerplay}/inc/smu11_driver_if.h  |  0
>>>    .../gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h |  0
>>>    .../drm/amd/pm/{ => powerplay}/inc/smu71.h    |  0
>>>    .../pm/{ => powerplay}/inc/smu71_discrete.h   |  0
>>>    .../drm/amd/pm/{ => powerplay}/inc/smu72.h    |  0
>>>    .../pm/{ => powerplay}/inc/smu72_discrete.h   |  0
>>>    .../drm/amd/pm/{ => powerplay}/inc/smu73.h    |  0
>>>    .../pm/{ => powerplay}/inc/smu73_discrete.h   |  0
>>>    .../drm/amd/pm/{ => powerplay}/inc/smu74.h    |  0
>>>    .../pm/{ => powerplay}/inc/smu74_discrete.h   |  0
>>>    .../drm/amd/pm/{ => powerplay}/inc/smu75.h    |  0
>>>    .../pm/{ => powerplay}/inc/smu75_discrete.h   |  0
>>>    .../amd/pm/{ => powerplay}/inc/smu7_common.h  |  0
>>>    .../pm/{ => powerplay}/inc/smu7_discrete.h    |  0
>>>    .../amd/pm/{ => powerplay}/inc/smu7_fusion.h  |  0
>>>    .../amd/pm/{ => powerplay}/inc/smu7_ppsmc.h   |  0
>>>    .../gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h |  0
>>>    .../amd/pm/{ => powerplay}/inc/smu8_fusion.h  |  0
>>>    .../gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h |  0
>>>    .../pm/{ => powerplay}/inc/smu9_driver_if.h   |  0
>>>    .../{ => powerplay}/inc/smu_ucode_xfer_cz.h   |  0
>>>    .../{ => powerplay}/inc/smu_ucode_xfer_vi.h   |  0
>>>    .../drm/amd/pm/{ => powerplay}/inc/smumgr.h   |  0
>>>    .../amd/pm/{ => powerplay}/inc/tonga_ppsmc.h  |  0
>>>    .../amd/pm/{ => powerplay}/inc/vega10_ppsmc.h |  0
>>>    .../inc/vega12/smu9_driver_if.h               |  0
>>>    .../amd/pm/{ => powerplay}/inc/vega12_ppsmc.h |  0
>>>    .../amd/pm/{ => powerplay}/inc/vega20_ppsmc.h |  0
>>>    .../drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h   |  0
>>>    .../inc/interface}/smu11_driver_if_arcturus.h |  0
>>>    .../smu11_driver_if_cyan_skillfish.h          |  0
>>>    .../inc/interface}/smu11_driver_if_navi10.h   |  0
>>>    .../smu11_driver_if_sienna_cichlid.h          |  0
>>>    .../inc/interface}/smu11_driver_if_vangogh.h  |  0
>>>    .../inc/interface}/smu12_driver_if.h          |  0
>>>    .../interface}/smu13_driver_if_aldebaran.h    |  0
>>>    .../interface}/smu13_driver_if_yellow_carp.h  |  0
>>>    .../inc/interface}/smu_v11_5_pmfw.h           |  0
>>>    .../inc/interface}/smu_v11_8_pmfw.h           |  0
>>>    .../inc/interface}/smu_v13_0_1_pmfw.h         |  0
>>>    .../inc/message}/aldebaran_ppsmc.h            |  0
>>>    .../inc/message}/arcturus_ppsmc.h             |  0
>>>    .../inc/message}/smu_v11_0_7_ppsmc.h          |  0
>>>    .../inc/message}/smu_v11_0_ppsmc.h            |  0
>>>    .../inc/message}/smu_v11_5_ppsmc.h            |  0
>>>    .../inc/message}/smu_v11_8_ppsmc.h            |  0
>>>    .../inc/message}/smu_v12_0_ppsmc.h            |  0
>>>    .../inc/message}/smu_v13_0_1_ppsmc.h          |  0
>>>    .../pm/{ => swsmu}/inc/smu_11_0_cdr_table.h   |  0
>>>    .../drm/amd/pm/{ => swsmu}/inc/smu_types.h    |  0
>>>    .../drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h    |  0
>>>    .../pm/{ => swsmu}/inc/smu_v11_0_7_pptable.h  |  0
>>>    .../pm/{ => swsmu}/inc/smu_v11_0_pptable.h    |  0
>>>    .../drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h    |  0
>>>    .../drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h    |  0
>>>    .../pm/{ => swsmu}/inc/smu_v13_0_pptable.h    |  0
>>>    .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c |  1 -
>>>    .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c    |  1 -
>>>    87 files changed, 41 insertions(+), 11 deletions(-)
>>>    create mode 100644 drivers/gpu/drm/amd/pm/legacy-dpm/Makefile
>>>    rename drivers/gpu/drm/amd/pm/{powerplay => legacy-
>> dpm}/cik_dpm.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_dpm.c
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{powerplay => legacy-
>> dpm}/kv_dpm.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/kv_smc.c
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{powerplay => legacy-
>> dpm}/legacy_dpm.c (100%)
>>>    rename drivers/gpu/drm/amd/pm/{powerplay => legacy-
>> dpm}/legacy_dpm.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/ppsmc.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{powerplay => legacy-
>> dpm}/r600_dpm.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.c
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_dpm.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{powerplay => legacy-dpm}/si_smc.c
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{powerplay => legacy-
>> dpm}/sislands_smc.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ =>
>> powerplay}/inc/amd_powerplay.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/cz_ppsmc.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/fiji_ppsmc.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ =>
>> powerplay}/inc/hardwaremanager.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/hwmgr.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ =>
>> powerplay}/inc/polaris10_pwrvirus.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/power_state.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_debug.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_endian.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/pp_thermal.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/ppinterrupt.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/rv_ppsmc.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu10.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ =>
>> powerplay}/inc/smu10_driver_if.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ =>
>> powerplay}/inc/smu11_driver_if.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu71_discrete.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu72_discrete.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu73_discrete.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu74_discrete.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu75_discrete.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_common.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_discrete.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_fusion.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu7_ppsmc.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu8_fusion.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smu9_driver_if.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ =>
>> powerplay}/inc/smu_ucode_xfer_cz.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ =>
>> powerplay}/inc/smu_ucode_xfer_vi.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/smumgr.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/tonga_ppsmc.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega10_ppsmc.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ =>
>> powerplay}/inc/vega12/smu9_driver_if.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega12_ppsmc.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => powerplay}/inc/vega20_ppsmc.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/amdgpu_smu.h
>> (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/interface}/smu11_driver_if_arcturus.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/interface}/smu11_driver_if_cyan_skillfish.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/interface}/smu11_driver_if_navi10.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/interface}/smu11_driver_if_sienna_cichlid.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/interface}/smu11_driver_if_vangogh.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/interface}/smu12_driver_if.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/interface}/smu13_driver_if_aldebaran.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/interface}/smu13_driver_if_yellow_carp.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/interface}/smu_v11_5_pmfw.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/interface}/smu_v11_8_pmfw.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/interface}/smu_v13_0_1_pmfw.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/message}/aldebaran_ppsmc.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/message}/arcturus_ppsmc.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/message}/smu_v11_0_7_ppsmc.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/message}/smu_v11_0_ppsmc.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/message}/smu_v11_5_ppsmc.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/message}/smu_v11_8_ppsmc.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>> swsmu/inc/message}/smu_v12_0_ppsmc.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{inc =>
>>> swsmu/inc/message}/smu_v13_0_1_ppsmc.h (100%)
>>
>> I didn't mean to separate them to two different folders. Original intention
>> was to group together FW headers as 'third party component'
>> headers in a separate folder.
> [Quan, Evan] OK, if I gather all those pmfw related headers into a separate folder named "pmfw_if", does that make sense to you?
> 
Yes, that's fine.

Thanks,
Lijo

> BR
> Evan
>>
>> As another thought, 'interface' folder also looks good but for a different
>> purpose - to keep the public API headers of swsmu and powerplay
>> components to other components.
>>
>> Thanks,
>> Lijo
>>
>>>    rename drivers/gpu/drm/amd/pm/{ =>
>> swsmu}/inc/smu_11_0_cdr_table.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_types.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v11_0.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ =>
>> swsmu}/inc/smu_v11_0_7_pptable.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ =>
>> swsmu}/inc/smu_v11_0_pptable.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v12_0.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ => swsmu}/inc/smu_v13_0.h (100%)
>>>    rename drivers/gpu/drm/amd/pm/{ =>
>> swsmu}/inc/smu_v13_0_pptable.h
>>> (100%)
>>>
>>> diff --git a/drivers/gpu/drm/amd/pm/Makefile
>>> b/drivers/gpu/drm/amd/pm/Makefile index d35ffde387f1..3d17ffb77f31
>>> 100644
>>> --- a/drivers/gpu/drm/amd/pm/Makefile
>>> +++ b/drivers/gpu/drm/amd/pm/Makefile
>>> @@ -21,20 +21,24 @@
>>>    #
>>>
>>>    subdir-ccflags-y += \
>>> -		-I$(FULL_AMD_PATH)/pm/inc/  \
>>>    		-I$(FULL_AMD_PATH)/include/asic_reg  \
>>>    		-I$(FULL_AMD_PATH)/include  \
>>> +		-I$(FULL_AMD_PATH)/pm/inc/  \
>>>    		-I$(FULL_AMD_PATH)/pm/swsmu \
>>> +		-I$(FULL_AMD_PATH)/pm/swsmu/inc \
>>> +		-I$(FULL_AMD_PATH)/pm/swsmu/inc/interface \
>>> +		-I$(FULL_AMD_PATH)/pm/swsmu/inc/message \
>>>    		-I$(FULL_AMD_PATH)/pm/swsmu/smu11 \
>>>    		-I$(FULL_AMD_PATH)/pm/swsmu/smu12 \
>>>    		-I$(FULL_AMD_PATH)/pm/swsmu/smu13 \
>>> -		-I$(FULL_AMD_PATH)/pm/powerplay \
>>> +		-I$(FULL_AMD_PATH)/pm/powerplay/inc \
>>>    		-I$(FULL_AMD_PATH)/pm/powerplay/smumgr\
>>> -		-I$(FULL_AMD_PATH)/pm/powerplay/hwmgr
>>> +		-I$(FULL_AMD_PATH)/pm/powerplay/hwmgr \
>>> +		-I$(FULL_AMD_PATH)/pm/legacy-dpm
>>>
>>>    AMD_PM_PATH = ../pm
>>>
>>> -PM_LIBS = swsmu powerplay
>>> +PM_LIBS = swsmu powerplay legacy-dpm
>>>
>>>    AMD_PM = $(addsuffix /Makefile,$(addprefix
>>> $(FULL_AMD_PATH)/pm/,$(PM_LIBS)))
>>>
>>> diff --git a/drivers/gpu/drm/amd/pm/legacy-dpm/Makefile
>>> b/drivers/gpu/drm/amd/pm/legacy-dpm/Makefile
>>> new file mode 100644
>>> index 000000000000..baa4265d1daa
>>> --- /dev/null
>>> +++ b/drivers/gpu/drm/amd/pm/legacy-dpm/Makefile
>>> @@ -0,0 +1,32 @@
>>> +#
>>> +# Copyright 2021 Advanced Micro Devices, Inc.
>>> +#
>>> +# Permission is hereby granted, free of charge, to any person
>>> +obtaining a # copy of this software and associated documentation
>>> +files (the "Software"), # to deal in the Software without
>>> +restriction, including without limitation # the rights to use, copy,
>>> +modify, merge, publish, distribute, sublicense, # and/or sell copies
>>> +of the Software, and to permit persons to whom the # Software is
>> furnished to do so, subject to the following conditions:
>>> +#
>>> +# The above copyright notice and this permission notice shall be
>>> +included in # all copies or substantial portions of the Software.
>>> +#
>>> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
>> KIND,
>>> +EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE
>> WARRANTIES OF
>>> +MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND
>>> +NONINFRINGEMENT.  IN NO EVENT SHALL # THE COPYRIGHT HOLDER(S)
>> OR
>>> +AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR # OTHER LIABILITY,
>>> +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # ARISING
>> FROM,
>>> +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR #
>> OTHER DEALINGS IN THE SOFTWARE.
>>> +#
>>> +
>>> +AMD_LEGACYDPM_PATH = ../pm/legacy-dpm
>>> +
>>> +LEGACYDPM_MGR-y = legacy_dpm.o
>>> +
>>> +LEGACYDPM_MGR-$(CONFIG_DRM_AMDGPU_CIK)+= kv_dpm.o
>> kv_smc.o
>>> +LEGACYDPM_MGR-$(CONFIG_DRM_AMDGPU_SI)+= si_dpm.o si_smc.o
>>> +
>>> +AMD_LEGACYDPM_POWER = $(addprefix
>>> +$(AMD_LEGACYDPM_PATH)/,$(LEGACYDPM_MGR-y))
>>> +
>>> +AMD_POWERPLAY_FILES += $(AMD_LEGACYDPM_POWER)
>>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/cik_dpm.h
>>> b/drivers/gpu/drm/amd/pm/legacy-dpm/cik_dpm.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/powerplay/cik_dpm.h
>>> rename to drivers/gpu/drm/amd/pm/legacy-dpm/cik_dpm.h
>>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c
>>> b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/powerplay/kv_dpm.c
>>> rename to drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c
>>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/kv_dpm.h
>>> b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/powerplay/kv_dpm.h
>>> rename to drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.h
>>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/kv_smc.c
>>> b/drivers/gpu/drm/amd/pm/legacy-dpm/kv_smc.c
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/powerplay/kv_smc.c
>>> rename to drivers/gpu/drm/amd/pm/legacy-dpm/kv_smc.c
>>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.c
>>> b/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.c
>>> rename to drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c
>>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.h
>>> b/drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/powerplay/legacy_dpm.h
>>> rename to drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h
>>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/legacy-dpm/ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/powerplay/ppsmc.h
>>> rename to drivers/gpu/drm/amd/pm/legacy-dpm/ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/r600_dpm.h
>>> b/drivers/gpu/drm/amd/pm/legacy-dpm/r600_dpm.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/powerplay/r600_dpm.h
>>> rename to drivers/gpu/drm/amd/pm/legacy-dpm/r600_dpm.h
>>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/si_dpm.c
>>> b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/powerplay/si_dpm.c
>>> rename to drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c
>>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/si_dpm.h
>>> b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/powerplay/si_dpm.h
>>> rename to drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.h
>>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/si_smc.c
>>> b/drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/powerplay/si_smc.c
>>> rename to drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c
>>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/sislands_smc.h
>>> b/drivers/gpu/drm/amd/pm/legacy-dpm/sislands_smc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/powerplay/sislands_smc.h
>>> rename to drivers/gpu/drm/amd/pm/legacy-dpm/sislands_smc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/Makefile
>>> b/drivers/gpu/drm/amd/pm/powerplay/Makefile
>>> index 614d8b6a58ad..795a3624cbbf 100644
>>> --- a/drivers/gpu/drm/amd/pm/powerplay/Makefile
>>> +++ b/drivers/gpu/drm/amd/pm/powerplay/Makefile
>>> @@ -28,11 +28,7 @@ AMD_POWERPLAY = $(addsuffix
>> /Makefile,$(addprefix
>>> $(FULL_AMD_PATH)/pm/powerplay/
>>>
>>>    include $(AMD_POWERPLAY)
>>>
>>> -POWER_MGR-y = amd_powerplay.o legacy_dpm.o
>>> -
>>> -POWER_MGR-$(CONFIG_DRM_AMDGPU_CIK)+= kv_dpm.o kv_smc.o
>>> -
>>> -POWER_MGR-$(CONFIG_DRM_AMDGPU_SI)+= si_dpm.o si_smc.o
>>> +POWER_MGR-y = amd_powerplay.o
>>>
>>>    AMD_PP_POWER = $(addprefix $(AMD_PP_PATH)/,$(POWER_MGR-y))
>>>
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/amd_powerplay.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/amd_powerplay.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/amd_powerplay.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/amd_powerplay.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/cz_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/cz_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/cz_ppsmc.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/cz_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/fiji_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/fiji_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/fiji_ppsmc.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/fiji_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/hardwaremanager.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/hardwaremanager.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/hardwaremanager.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/hardwaremanager.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/hwmgr.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/hwmgr.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/polaris10_pwrvirus.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/polaris10_pwrvirus.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/polaris10_pwrvirus.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/polaris10_pwrvirus.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/power_state.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/power_state.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/power_state.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/power_state.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/pp_debug.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/pp_debug.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/pp_debug.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/pp_debug.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/pp_endian.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/pp_endian.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/pp_endian.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/pp_endian.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/pp_thermal.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/pp_thermal.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/pp_thermal.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/pp_thermal.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/ppinterrupt.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/ppinterrupt.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/ppinterrupt.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/ppinterrupt.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/rv_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/rv_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/rv_ppsmc.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/rv_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu10.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu10.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu10.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu10.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu10_driver_if.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu10_driver_if.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu10_driver_if.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu10_driver_if.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu11_driver_if.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu11_driver_if.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu11_driver_if.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu11_driver_if.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu7.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu7.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu7.h rename to
>>> drivers/gpu/drm/amd/pm/powerplay/inc/smu7.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu71.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu71.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu71.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu71.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu71_discrete.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu71_discrete.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu71_discrete.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu71_discrete.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu72.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu72.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu72.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu72.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu72_discrete.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu72_discrete.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu72_discrete.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu72_discrete.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu73.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu73.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu73.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu73.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu73_discrete.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu73_discrete.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu73_discrete.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu73_discrete.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu74.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu74.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu74.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu74.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu74_discrete.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu74_discrete.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu74_discrete.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu74_discrete.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu75.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu75.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu75.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu75.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu75_discrete.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu75_discrete.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu75_discrete.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu75_discrete.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu7_common.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu7_common.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu7_common.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu7_common.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu7_discrete.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu7_discrete.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu7_discrete.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu7_discrete.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu7_fusion.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu7_fusion.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu7_fusion.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu7_fusion.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu7_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu7_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu7_ppsmc.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu7_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu8.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu8.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu8.h rename to
>>> drivers/gpu/drm/amd/pm/powerplay/inc/smu8.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu8_fusion.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu8_fusion.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu8_fusion.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu8_fusion.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu9.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu9.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu9.h rename to
>>> drivers/gpu/drm/amd/pm/powerplay/inc/smu9.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu9_driver_if.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu9_driver_if.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu9_driver_if.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smu9_driver_if.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_ucode_xfer_cz.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_cz.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_ucode_xfer_cz.h
>>> rename to
>> drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_cz.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_ucode_xfer_vi.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_vi.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_ucode_xfer_vi.h
>>> rename to
>> drivers/gpu/drm/amd/pm/powerplay/inc/smu_ucode_xfer_vi.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smumgr.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/smumgr.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smumgr.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/smumgr.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/tonga_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/tonga_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/tonga_ppsmc.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/tonga_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/vega10_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/vega10_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/vega10_ppsmc.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/vega10_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/vega12/smu9_driver_if.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/vega12/smu9_driver_if.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/vega12/smu9_driver_if.h
>>> rename to
>> drivers/gpu/drm/amd/pm/powerplay/inc/vega12/smu9_driver_if.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/vega12_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/vega12_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/vega12_ppsmc.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/vega12_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/vega20_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/powerplay/inc/vega20_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/vega20_ppsmc.h
>>> rename to drivers/gpu/drm/amd/pm/powerplay/inc/vega20_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
>>> rename to drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_arcturus.h
>>>
>> b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_arcturu
>> s.
>>> h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_arcturus.h
>>> rename to
>>>
>> drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_arcturus.h
>>> diff --git
>>> a/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_cyan_skillfish.h
>>>
>> b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_cyan_s
>> kil
>>> lfish.h
>>> similarity index 100%
>>> rename from
>>> drivers/gpu/drm/amd/pm/inc/smu11_driver_if_cyan_skillfish.h
>>> rename to
>>>
>> drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_cyan_skill
>> f
>>> ish.h diff --git a/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_navi10.h
>>>
>> b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_navi10.
>> h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_navi10.h
>>> rename to
>>> drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_navi10.h
>>> diff --git
>>> a/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h
>>>
>> b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_sienna_
>> ci
>>> chlid.h
>>> similarity index 100%
>>> rename from
>>> drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h
>>> rename to
>>>
>> drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_sienna_ci
>> ch
>>> lid.h diff --git
>>> a/drivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h
>>>
>> b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_vangog
>> h.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu11_driver_if_vangogh.h
>>> rename to
>>>
>> drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu11_driver_if_vangogh.
>> h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu12_driver_if.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu12_driver_if.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu12_driver_if.h
>>> rename to
>> drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu12_driver_if.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h
>>>
>> b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_aldebar
>> an
>>> .h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h
>>> rename to
>>>
>> drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_aldebaran
>> .h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu13_driver_if_yellow_carp.h
>>>
>> b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_yellow_
>> ca
>>> rp.h
>>> similarity index 100%
>>> rename from
>> drivers/gpu/drm/amd/pm/inc/smu13_driver_if_yellow_carp.h
>>> rename to
>>>
>> drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu13_driver_if_yellow_ca
>> rp
>>> .h diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_5_pmfw.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v11_5_pmfw.h
>>> rename to
>> drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_5_pmfw.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_8_pmfw.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_8_pmfw.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v11_8_pmfw.h
>>> rename to
>> drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v11_8_pmfw.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v13_0_1_pmfw.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_pmfw.h
>>> rename to
>>> drivers/gpu/drm/amd/pm/swsmu/inc/interface/smu_v13_0_1_pmfw.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/message/aldebaran_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/aldebaran_ppsmc.h
>>> rename to
>> drivers/gpu/drm/amd/pm/swsmu/inc/message/aldebaran_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/message/arcturus_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/arcturus_ppsmc.h
>>> rename to
>> drivers/gpu/drm/amd/pm/swsmu/inc/message/arcturus_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_7_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_ppsmc.h
>>> rename to
>> drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_7_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_0_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v11_0_ppsmc.h
>>> rename to
>> drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_0_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_5_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v11_5_ppsmc.h
>>> rename to
>> drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_5_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_8_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_8_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v11_8_ppsmc.h
>>> rename to
>> drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v11_8_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v12_0_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v12_0_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v12_0_ppsmc.h
>>> rename to
>> drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v12_0_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v13_0_1_ppsmc.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v13_0_1_ppsmc.h
>>> rename to
>> drivers/gpu/drm/amd/pm/swsmu/inc/message/smu_v13_0_1_ppsmc.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_11_0_cdr_table.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_11_0_cdr_table.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_11_0_cdr_table.h
>>> rename to drivers/gpu/drm/amd/pm/swsmu/inc/smu_11_0_cdr_table.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_types.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_types.h
>>> rename to drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
>>> rename to drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_pptable.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v11_0_7_pptable.h
>>> rename to drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_7_pptable.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_0_pptable.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_pptable.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v11_0_pptable.h
>>> rename to drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0_pptable.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v12_0.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v12_0.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v12_0.h
>>> rename to drivers/gpu/drm/amd/pm/swsmu/inc/smu_v12_0.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v13_0.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v13_0.h
>>> rename to drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
>>> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v13_0_pptable.h
>>> b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_pptable.h
>>> similarity index 100%
>>> rename from drivers/gpu/drm/amd/pm/inc/smu_v13_0_pptable.h
>>> rename to drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_pptable.h
>>> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
>>> b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
>>> index a03bbd2a7aa0..1e6d76657bbb 100644
>>> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
>>> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
>>> @@ -33,7 +33,6 @@
>>>    #include "smu11_driver_if_arcturus.h"
>>>    #include "soc15_common.h"
>>>    #include "atom.h"
>>> -#include "power_state.h"
>>>    #include "arcturus_ppt.h"
>>>    #include "smu_v11_0_pptable.h"
>>>    #include "arcturus_ppsmc.h"
>>> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
>>> b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
>>> index 3c82f5455f88..cc502a35f9ef 100644
>>> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
>>> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
>>> @@ -33,7 +33,6 @@
>>>    #include "smu13_driver_if_aldebaran.h"
>>>    #include "soc15_common.h"
>>>    #include "atom.h"
>>> -#include "power_state.h"
>>>    #include "aldebaran_ppt.h"
>>>    #include "smu_v13_0_pptable.h"
>>>    #include "aldebaran_ppsmc.h"
>>>


More information about the amd-gfx mailing list