From: Alex Deucher <alexander.deucher@amd.com>
Date: Thu, 11 Mar 2021 14:15:26 +0000 (-0500)
Subject: Revert "amd/amdgpu: Disable VCN DPG mode for Picasso"
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b3a7b542e74437f5776cad1f88ffb3ab35d6f8d6;p=users%2Fjedix%2Flinux-maple.git

Revert "amd/amdgpu: Disable VCN DPG mode for Picasso"

This reverts commit c6d2b0fbb893d5c7dda405aa0e7bcbecf1c75f98.

This patch is a workaround for a hardware bug, but I don't
know that we've actually seen the hw bug triggered in practice,
meanwhile a number of people have reported that this causes
suspend and resume issues.

Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211277
Cc: Veerabadhran Gopalakrishnan <veerabadhran.gopalakrishnan@amd.com>
Cc: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index d80e12b80c7e5..096e643689033 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -1405,7 +1405,8 @@ static int soc15_common_early_init(void *handle)
 
 			adev->pg_flags = AMD_PG_SUPPORT_SDMA |
 				AMD_PG_SUPPORT_MMHUB |
-				AMD_PG_SUPPORT_VCN;
+				AMD_PG_SUPPORT_VCN |
+				AMD_PG_SUPPORT_VCN_DPG;
 		} else {
 			adev->cg_flags = AMD_CG_SUPPORT_GFX_MGCG |
 				AMD_CG_SUPPORT_GFX_MGLS |