diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3511-drm-amdgpu-powerplay-add-smu-ip-block-for-renoir-v2.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3511-drm-amdgpu-powerplay-add-smu-ip-block-for-renoir-v2.patch | 110 |
1 files changed, 110 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3511-drm-amdgpu-powerplay-add-smu-ip-block-for-renoir-v2.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3511-drm-amdgpu-powerplay-add-smu-ip-block-for-renoir-v2.patch new file mode 100644 index 00000000..d44f5294 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3511-drm-amdgpu-powerplay-add-smu-ip-block-for-renoir-v2.patch @@ -0,0 +1,110 @@ +From 5054202acfdaa9cf089c1df111290e11df26bd2d Mon Sep 17 00:00:00 2001 +From: Aaron Liu <aaron.liu@amd.com> +Date: Wed, 24 Jul 2019 14:00:01 -0500 +Subject: [PATCH 3511/4256] drm/amdgpu/powerplay: add smu ip block for renoir + (v2) + +add swSMU [smu_v12_0] for renoir + +v2: whitespace fixes (Alex) + +Signed-off-by: Aaron Liu <aaron.liu@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/soc15.c | 2 ++ + drivers/gpu/drm/amd/powerplay/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 19 +++++++++++++++++++ + .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 ++ + 4 files changed, 24 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c +index 2cf61946f3f1..3040e30eb970 100644 +--- a/drivers/gpu/drm/amd/amdgpu/soc15.c ++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c +@@ -761,6 +761,8 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) + amdgpu_device_ip_block_add(adev, &psp_v12_0_ip_block); + amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block); + amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block); ++ if (is_support_sw_smu(adev)) ++ amdgpu_device_ip_block_add(adev, &smu_v12_0_ip_block); + if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) + amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); + amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); +diff --git a/drivers/gpu/drm/amd/powerplay/Makefile b/drivers/gpu/drm/amd/powerplay/Makefile +index e05a7e3d6d8d..390345f2d601 100644 +--- a/drivers/gpu/drm/amd/powerplay/Makefile ++++ b/drivers/gpu/drm/amd/powerplay/Makefile +@@ -35,7 +35,7 @@ AMD_POWERPLAY = $(addsuffix /Makefile,$(addprefix $(FULL_AMD_PATH)/powerplay/,$( + + include $(AMD_POWERPLAY) + +-POWER_MGR = amd_powerplay.o amdgpu_smu.o smu_v11_0.o vega20_ppt.o arcturus_ppt.o navi10_ppt.o ++POWER_MGR = amd_powerplay.o amdgpu_smu.o smu_v11_0.o smu_v12_0.o vega20_ppt.o arcturus_ppt.o navi10_ppt.o renoir_ppt.o + + AMD_PP_POWER = $(addprefix $(AMD_PP_PATH)/,$(POWER_MGR)) + +diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +index 4df7fb6eaf3c..54424babc8ca 100644 +--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c ++++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +@@ -27,6 +27,7 @@ + #include "amdgpu_smu.h" + #include "soc15_common.h" + #include "smu_v11_0.h" ++#include "smu_v12_0.h" + #include "atom.h" + #include "amd_pcie.h" + +@@ -735,6 +736,12 @@ static int smu_set_funcs(struct amdgpu_device *adev) + smu->od_enabled = true; + smu_v11_0_set_smu_funcs(smu); + break; ++ case CHIP_RENOIR: ++ adev->pm.pp_feature &= ~PP_GFXOFF_MASK; ++ if (adev->pm.pp_feature & PP_OVERDRIVE_MASK) ++ smu->od_enabled = true; ++ smu_v12_0_set_smu_funcs(smu); ++ break; + default: + return -EINVAL; + } +@@ -1031,6 +1038,9 @@ static int smu_smc_table_hw_init(struct smu_context *smu, + struct amdgpu_device *adev = smu->adev; + int ret; + ++ if (adev->flags & AMD_IS_APU) ++ return 0; ++ + if (smu_is_dpm_running(smu) && adev->in_suspend) { + pr_info("dpm has been enabled\n"); + return 0; +@@ -1790,3 +1800,12 @@ const struct amdgpu_ip_block_version smu_v11_0_ip_block = + .rev = 0, + .funcs = &smu_ip_funcs, + }; ++ ++const struct amdgpu_ip_block_version smu_v12_0_ip_block = ++{ ++ .type = AMD_IP_BLOCK_TYPE_SMC, ++ .major = 12, ++ .minor = 0, ++ .rev = 0, ++ .funcs = &smu_ip_funcs, ++}; +diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +index e80c81552d29..61d453f83f88 100644 +--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h ++++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +@@ -755,6 +755,8 @@ extern int smu_get_atom_data_table(struct smu_context *smu, uint32_t table, + extern const struct amd_ip_funcs smu_ip_funcs; + + extern const struct amdgpu_ip_block_version smu_v11_0_ip_block; ++extern const struct amdgpu_ip_block_version smu_v12_0_ip_block; ++ + extern int smu_feature_init_dpm(struct smu_context *smu); + + extern int smu_feature_is_enabled(struct smu_context *smu, +-- +2.17.1 + |