5.9-stable patches

added patches:
	revert-amd-amdgpu-disable-vcn-dpg-mode-for-picasso.patch

diff --git a/queue-5.9/revert-amd-amdgpu-disable-vcn-dpg-mode-for-picasso.patch b/queue-5.9/revert-amd-amdgpu-disable-vcn-dpg-mode-for-picasso.patch
new file mode 100644 (file)
index 0000000..7af17b4
--- /dev/null
+++ b/queue-5.9/revert-amd-amdgpu-disable-vcn-dpg-mode-for-picasso.patch
@@ -0,0 +1,36 @@
+From alexdeucher@gmail.com  Wed Dec  9 17:19:11 2020
+From: Alex Deucher <alexdeucher@gmail.com>
+Date: Wed,  9 Dec 2020 10:42:22 -0500
+Subject: [PATCH] Revert "amd/amdgpu: Disable VCN DPG mode for Picasso"
+To: stable@vger.kernel.org
+Cc: Alex Deucher <alexander.deucher@amd.com>, Sasha Levin <sashal@kernel.org>
+Message-ID: <20201209154222.1069043-1-alexander.deucher@amd.com>
+
+From: Alex Deucher <alexdeucher@gmail.com>
+
+This patch should not have been applied to stable.  It depends
+on changes in newer drivers.
+
+This reverts commit 756fec062e4b823bbbe10b95cbcfa84f948131c6.
+
+Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1402
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: Sasha Levin <sashal@kernel.org>
+Cc: stable@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/soc15.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
+@@ -1220,7 +1220,8 @@ static int soc15_common_early_init(void
+ 
+                       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 |

diff --git a/queue-5.9/series b/queue-5.9/series
index 94c2e92833b3e061e1b65c7b65c544485f4425a1..a274c0432767518a6cba8487f9ddcfd1521d61d3 100644 (file)
--- a/queue-5.9/series
+++ b/queue-5.9/series
@@ -53,3 +53,4 @@ coredump-fix-core_pattern-parse-error.patch
 mm-list_lru-set-shrinker-map-bit-when-child-nr_items-is-not-zero.patch
 mm-swapfile-do-not-sleep-with-a-spin-lock-held.patch
 hugetlb_cgroup-fix-offline-of-hugetlb-cgroup-with-reservations.patch
+revert-amd-amdgpu-disable-vcn-dpg-mode-for-picasso.patch