diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2283-drm-amd-amdgpu-fw-version-check-with-gfxoff.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2283-drm-amd-amdgpu-fw-version-check-with-gfxoff.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2283-drm-amd-amdgpu-fw-version-check-with-gfxoff.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2283-drm-amd-amdgpu-fw-version-check-with-gfxoff.patch new file mode 100644 index 00000000..cc003285 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2283-drm-amd-amdgpu-fw-version-check-with-gfxoff.patch @@ -0,0 +1,75 @@ +From 7d11a81a24fec0136cd3b515184d348eb9212a8c Mon Sep 17 00:00:00 2001 +From: Kenneth Feng <kenneth.feng@amd.com> +Date: Wed, 27 Mar 2019 17:10:09 +0800 +Subject: [PATCH 2283/2940] drm/amd/amdgpu: fw version check with gfxoff + +1. check the firmware version when enabling gfxoff +2. overwrite the pptable to make sure gfxoff is really +enabled on navi10 + +Signed-off-by: Kenneth Feng <kenneth.feng@amd.com> +Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 1 - + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 11 +++++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +index cc245f4c61ab..63df59e7335d 100644 +--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c ++++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +@@ -331,7 +331,6 @@ static int smu_set_funcs(struct amdgpu_device *adev) + switch (adev->asic_type) { + case CHIP_VEGA20: + case CHIP_NAVI10: +- adev->pm.pp_feature &= ~PP_GFXOFF_MASK; + if (adev->pm.pp_feature & PP_OVERDRIVE_MASK) + smu->od_enabled = true; + smu_v11_0_set_smu_funcs(smu); +diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +index b8d9d1a73b16..b78fa7fc0623 100644 +--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c ++++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +@@ -117,6 +117,8 @@ static int + navi10_get_allowed_feature_mask(struct smu_context *smu, + uint32_t *feature_mask, uint32_t num) + { ++ struct amdgpu_device *adev = smu->adev; ++ + if (num > 2) + return -EINVAL; + +@@ -139,6 +141,10 @@ navi10_get_allowed_feature_mask(struct smu_context *smu, + | FEATURE_MASK(FEATURE_MMHUB_PG) + | FEATURE_MASK(FEATURE_ATHUB_PG); + ++ if (adev->pm.pp_feature & PP_GFXOFF_MASK) ++ *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_GFX_SS_BIT) ++ | FEATURE_MASK(FEATURE_GFXOFF_BIT); ++ + return 0; + } + +@@ -149,6 +155,7 @@ static int navi10_check_powerplay_table(struct smu_context *smu) + + static int navi10_append_powerplay_table(struct smu_context *smu) + { ++ struct amdgpu_device *adev = smu->adev; + struct smu_table_context *table_context = &smu->smu_table; + PPTable_t *smc_pptable = table_context->driver_pptable; + struct atom_smc_dpm_info_v4_5 *smc_dpm_table; +@@ -234,6 +241,10 @@ static int navi10_append_powerplay_table(struct smu_context *smu) + /* Mvdd Svi2 Div Ratio Setting */ + smc_pptable->MvddRatio = smc_dpm_table->MvddRatio; + ++ if (adev->pm.pp_feature & PP_GFXOFF_MASK) ++ *(uint64_t *)smc_pptable->FeaturesToRun |= FEATURE_MASK(FEATURE_GFX_SS_BIT) ++ | FEATURE_MASK(FEATURE_GFXOFF_BIT); ++ + return 0; + } + +-- +2.17.1 + |