[arch-commits] Commit in linux-lts/trunk (2 files)

[Jan Steffens]

    Date: Sunday, April 19, 2020 @ 13:52:10
  Author: heftig
Revision: 380548

5.4.33-3

Added:
  linux-lts/trunk/drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch
Modified:
  linux-lts/trunk/PKGBUILD

-------------------------------------------------------------------------+
 PKGBUILD                                                                |    8 +-
 drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch |   37 ++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-19 13:52:04 UTC (rev 380547)
+++ PKGBUILD	2020-04-19 13:52:10 UTC (rev 380548)
@@ -2,7 +2,7 @@
 
 pkgbase=linux-lts
 pkgver=5.4.33
-pkgrel=2
+pkgrel=3
 pkgdesc='LTS Linux'
 url="https://www.kernel.org/"
 arch=(x86_64)
@@ -18,7 +18,10 @@
   config         # the main kernel config file
   0001-add-sysctl-and-CONFIG-for-unprivileged_userns_clone.patch
   sphinx-workaround.patch
+
+  # From stable-queue
   revert-acpi-ec-do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch
+  drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -30,7 +33,8 @@
             '8b202067f6f0adbe2f8d4290624005f4fa1fff32aaa42f979c9ab03f6b74b62f'
             'a13581d3c6dc595206e4fe7fcf6b542e7a1bdbe96101f0f010fc5be49f99baf2'
             'b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e'
-            '9fd93b899e03accd31ab357a70e538220c424ce8769e63a8b961fa627ab27c0a')
+            '9fd93b899e03accd31ab357a70e538220c424ce8769e63a8b961fa627ab27c0a'
+            '3015cbbcd0527bef418c45febed7b18a97e1783901ecf9b3693024a9ee867138')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase

Added: drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch
===================================================================
--- drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch	                        (rev 0)
+++ drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch	2020-04-19 13:52:10 UTC (rev 380548)
@@ -0,0 +1,37 @@
+From b2a7e9735ab2864330be9d00d7f38c961c28de5d Mon Sep 17 00:00:00 2001
+From: Prike Liang <Prike.Liang at amd.com>
+Date: Mon, 13 Apr 2020 21:41:14 +0800
+Subject: drm/amdgpu: fix the hw hang during perform system reboot and reset
+
+From: Prike Liang <Prike.Liang at amd.com>
+
+commit b2a7e9735ab2864330be9d00d7f38c961c28de5d upstream.
+
+The system reboot failed as some IP blocks enter power gate before perform
+hw resource destory. Meanwhile use unify interface to set device CGPG to ungate
+state can simplify the amdgpu poweroff or reset ungate guard.
+
+Fixes: 487eca11a321ef ("drm/amdgpu: fix gfx hang during suspend with video playback (v2)")
+Signed-off-by: Prike Liang <Prike.Liang at amd.com>
+Tested-by: Mengbing Wang <Mengbing.Wang at amd.com>
+Tested-by: Paul Menzel <pmenzel at molgen.mpg.de>
+Acked-by: Alex Deucher <alexander.deucher at amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
+Cc: stable at vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -2176,6 +2176,8 @@ static int amdgpu_device_ip_suspend_phas
+ {
+ 	int i, r;
+ 
++	amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);
++	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);
+ 
+ 	for (i = adev->num_ip_blocks - 1; i >= 0; i--) {
+ 		if (!adev->ip_blocks[i].status.valid)