Commit e098bc96 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/pm: optimize the power related source code layout 



The target is to provide a clear entry point(for power routines).
Also this can help to maintain a clear view about the frameworks
used on different ASICs. Hopefully all these can make power part
more friendly to play with.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e9372d23

drivers/gpu/drm/amd/amdgpu/Makefile

+5 −9
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ FULL_AMD_DISPLAY_PATH = $(FULL_AMD_PATH)/$(DISPLAY_FOLDER_NAME) 
ccflags-y := -I$(FULL_AMD_PATH)/include/asic_reg \

	-I$(FULL_AMD_PATH)/include \

	-I$(FULL_AMD_PATH)/amdgpu \

	-I$(FULL_AMD_PATH)/powerplay/inc \

	-I$(FULL_AMD_PATH)/pm/inc \

	-I$(FULL_AMD_PATH)/acp/include \

	-I$(FULL_AMD_DISPLAY_PATH) \

	-I$(FULL_AMD_DISPLAY_PATH)/include \
@@ -47,7 +47,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_encoders.o amdgpu_display.o amdgpu_i2c.o \

	amdgpu_fb.o amdgpu_gem.o amdgpu_ring.o \

	amdgpu_cs.o amdgpu_bios.o amdgpu_benchmark.o amdgpu_test.o \

	amdgpu_pm.o atombios_dp.o amdgpu_afmt.o amdgpu_trace_points.o \

	atombios_dp.o amdgpu_afmt.o amdgpu_trace_points.o \

	atombios_encoders.o amdgpu_sa.o atombios_i2c.o \

	amdgpu_dma_buf.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \

	amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \
@@ -60,10 +60,10 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o



# add asic specific block

amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \

amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o \

	dce_v8_0.o gfx_v7_0.o cik_sdma.o uvd_v4_2.o vce_v2_0.o



amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce_v6_0.o si_dpm.o si_smc.o \

amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce_v6_0.o \

	uvd_v3_1.o



amdgpu-y += \
@@ -105,10 +105,6 @@ amdgpu-y += \ 
	psp_v11_0.o \

	psp_v12_0.o



# add SMC block

amdgpu-y += \

	amdgpu_dpm.o



# add DCE block

amdgpu-y += \

	dce_v10_0.o \
@@ -212,7 +208,7 @@ amdgpu-$(CONFIG_VGA_SWITCHEROO) += amdgpu_atpx_handler.o 
amdgpu-$(CONFIG_ACPI) += amdgpu_acpi.o

amdgpu-$(CONFIG_HMM_MIRROR) += amdgpu_mn.o



include $(FULL_AMD_PATH)/powerplay/Makefile

include $(FULL_AMD_PATH)/pm/Makefile



amdgpu-y += $(AMD_POWERPLAY_FILES)

drivers/gpu/drm/amd/pm/Makefile

0 → 100644
+46 −0
Original line number Diff line number Diff line 
#

# Copyright 2017 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.

#



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/swsmu \

		-I$(FULL_AMD_PATH)/pm/swsmu/smu11 \

		-I$(FULL_AMD_PATH)/pm/swsmu/smu12 \

		-I$(FULL_AMD_PATH)/pm/powerplay \

		-I$(FULL_AMD_PATH)/pm/powerplay/smumgr\

		-I$(FULL_AMD_PATH)/pm/powerplay/hwmgr



AMD_PM_PATH = ../pm



PM_LIBS = swsmu powerplay



AMD_PM = $(addsuffix /Makefile,$(addprefix $(FULL_AMD_PATH)/pm/,$(PM_LIBS)))



include $(AMD_PM)



PM_MGR = amdgpu_dpm.o amdgpu_pm.o



AMD_PM_POWER = $(addprefix $(AMD_PM_PATH)/,$(PM_MGR))



AMD_POWERPLAY_FILES += $(AMD_PM_POWER)