diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2593-drm-amd-powerplay-make-mmhub-pg-bit-configured-by-pg.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2593-drm-amd-powerplay-make-mmhub-pg-bit-configured-by-pg.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2593-drm-amd-powerplay-make-mmhub-pg-bit-configured-by-pg.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2593-drm-amd-powerplay-make-mmhub-pg-bit-configured-by-pg.patch new file mode 100644 index 00000000..007f7f21 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2593-drm-amd-powerplay-make-mmhub-pg-bit-configured-by-pg.patch @@ -0,0 +1,56 @@ +From 0b7466c230e5bb7c82eb3d44775d39ee943f1e4b Mon Sep 17 00:00:00 2001 +From: Huang Rui <ray.huang@amd.com> +Date: Fri, 14 Jun 2019 16:12:51 +0800 +Subject: [PATCH 2593/2940] drm/amd/powerplay: make mmhub pg bit configured by + pg_flags + +The mmhub pg features enabling should be indicated by pg_flags. + +Reported-by: Lijo Lazar <Lijo.Lazar@amd.com> +Signed-off-by: Huang Rui <ray.huang@amd.com> +Reviewed-by: Kenneth Feng <kenneth.feng@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/nv.c | 3 ++- + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 4 +++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c +index e705b453b7c4..38f086ade1e3 100644 +--- a/drivers/gpu/drm/amd/amdgpu/nv.c ++++ b/drivers/gpu/drm/amd/amdgpu/nv.c +@@ -508,7 +508,8 @@ static int nv_common_early_init(void *handle) + AMD_CG_SUPPORT_BIF_MGCG | + AMD_CG_SUPPORT_BIF_LS; + adev->pg_flags = AMD_PG_SUPPORT_VCN | +- AMD_PG_SUPPORT_VCN_DPG; ++ AMD_PG_SUPPORT_VCN_DPG | ++ AMD_PG_SUPPORT_MMHUB; + adev->external_rev_id = adev->rev_id + 0x1; + break; + default: +diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +index 66fb2ee7331b..928f870f556f 100644 +--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c ++++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c +@@ -325,7 +325,6 @@ navi10_get_allowed_feature_mask(struct smu_context *smu, + | FEATURE_MASK(FEATURE_FAN_CONTROL_BIT) + | FEATURE_MASK(FEATURE_THERMAL_BIT) + | FEATURE_MASK(FEATURE_LED_DISPLAY_BIT) +- | FEATURE_MASK(FEATURE_MMHUB_PG_BIT) + | FEATURE_MASK(FEATURE_ATHUB_PG_BIT) + | FEATURE_MASK(FEATURE_DPM_DCEFCLK_BIT) + | FEATURE_MASK(FEATURE_DS_GFXCLK_BIT) +@@ -346,6 +345,9 @@ navi10_get_allowed_feature_mask(struct smu_context *smu, + *(uint64_t *)feature_mask &= ~FEATURE_MASK(FEATURE_FW_DSTATE_BIT); + } + ++ if (smu->adev->pg_flags & AMD_PG_SUPPORT_MMHUB) ++ *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_MMHUB_PG_BIT); ++ + if (smu->adev->pg_flags & AMD_PG_SUPPORT_VCN) + *(uint64_t *)feature_mask |= FEATURE_MASK(FEATURE_VCN_PG_BIT); + +-- +2.17.1 + |