From 1f91f61694d23b99ecc4ad362140628a797e4524 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Mon, 29 Jun 2020 23:21:23 +0200
Subject: [PATCH] linux57-tkg: Add a patch from Nicholas Kazlauskas to fix an
 amdgpu crash introduced in 5.7.6

https://gitlab.freedesktop.org/drm/amd/-/issues/1191
---
 linux57-tkg/PKGBUILD                          |  4 +-
 .../0003-glitched-base.patch                  | 43 +++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/linux57-tkg/PKGBUILD b/linux57-tkg/PKGBUILD
index 1842695..e60cad0 100644
--- a/linux57-tkg/PKGBUILD
+++ b/linux57-tkg/PKGBUILD
@@ -89,7 +89,7 @@ pkgname=("${pkgbase}" "${pkgbase}-headers")
 _basekernel=5.7
 _sub=6
 pkgver="${_basekernel}"."${_sub}"
-pkgrel=12
+pkgrel=13
 pkgdesc='Linux-tkg'
 arch=('x86_64') # no i686 in here
 url="http://www.kernel.org/"
@@ -133,7 +133,7 @@ sha256sums=('de8163bb62f822d84f7a3983574ec460060bf013a78ff79cd7c979ff1ec1d7e0'
             '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997'
             '31dc68e84aecfb7d069efb1305049122c65694676be8b955634abcf0675922a2'
             'd02bf5ca08fd610394b9d3a0c3b176d74af206f897dee826e5cbaec97bb4a4aa'
-            '9eae36f2e3265b787592e64259bcd5a1de4a524a55b2eccb2e3121f1ff1c209f'
+            '968b248660d5432939c1ef80dc588bdd6ffcdc76eb1818d93afbfe10b3181afb'
             '7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7'
             'c605f638d74c61861ebdc36ebd4cb8b6475eae2f6273e1ccb2bbb3e10a2ec3fe'
             'bc69d6e5ee8172b0242c8fa72d13cfe2b8d2b6601468836908a7dfe8b78a3bbb'
diff --git a/linux57-tkg/linux57-tkg-patches/0003-glitched-base.patch b/linux57-tkg/linux57-tkg-patches/0003-glitched-base.patch
index 8b6381f..06ce7c7 100644
--- a/linux57-tkg/linux57-tkg-patches/0003-glitched-base.patch
+++ b/linux57-tkg/linux57-tkg-patches/0003-glitched-base.patch
@@ -598,3 +598,46 @@ index d2fa3e9ccd97c..bd10cb02fc0ff 100644
  	if (!strcmp(str, "force"))
  		force_load = 1;
  	if (!strcmp(str, "hwp_only"))
+
+From 618c5a1236f179525d5f55beba23acf796581623 Mon Sep 17 00:00:00 2001
+From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
+Date: Mon, 29 Jun 2020 13:03:52 -0400
+Subject: [PATCH] drm/amd/display: Only revalidate bandwidth on medium and fast
+ updates
+
+[Why]
+Changes that are fast don't require updating DLG parameters making
+this call unnecessary. Considering this is an expensive call it should
+not be done on every flip.
+
+[How]
+Guard the validation to only happen if update type isn't FAST.
+
+Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
+index 67402d75e67e..942ceb0f6383 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
+@@ -2607,10 +2607,12 @@ void dc_commit_updates_for_stream(struct dc *dc,
+ 
+ 	copy_stream_update_to_stream(dc, context, stream, stream_update);
+ 
+-	if (!dc->res_pool->funcs->validate_bandwidth(dc, context, false)) {
+-		DC_ERROR("Mode validation failed for stream update!\n");
+-		dc_release_state(context);
+-		return;
++	if (update_type > UPDATE_TYPE_FAST) {
++		if (!dc->res_pool->funcs->validate_bandwidth(dc, context, false)) {
++			DC_ERROR("Mode validation failed for stream update!\n");
++			dc_release_state(context);
++			return;
++		}
+ 	}
+ 
+ 	commit_planes_for_stream(
+-- 
+2.25.1