Date: Tuesday, April 21, 2020 @ 11:48:34 Author: heftig Revision: 380667
5.4.34-1 Modified: linux-lts/trunk/PKGBUILD Deleted: linux-lts/trunk/drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch linux-lts/trunk/revert-acpi-ec-do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch -------------------------------------------------------------------------+ PKGBUILD | 14 -- drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch | 37 ------- revert-acpi-ec-do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch | 50 ---------- 3 files changed, 4 insertions(+), 97 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-04-21 11:06:49 UTC (rev 380666) +++ PKGBUILD 2020-04-21 11:48:34 UTC (rev 380667) @@ -1,8 +1,8 @@ # Maintainer: Andreas Radke <andy...@archlinux.org> pkgbase=linux-lts -pkgver=5.4.33 -pkgrel=3 +pkgver=5.4.34 +pkgrel=1 pkgdesc='LTS Linux' url="https://www.kernel.org/"; arch=(x86_64) @@ -18,10 +18,6 @@ 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 @@ -28,13 +24,11 @@ '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256sums=('b5579621302a6169b389b64dd9ef084df3bb2f11d91dd73273f76e2323223861' +sha256sums=('903ec1334daba6a626688f799cc947b420cf6fc8ce83055313dc4e9978d64cd2' 'SKIP' '8b202067f6f0adbe2f8d4290624005f4fa1fff32aaa42f979c9ab03f6b74b62f' 'a13581d3c6dc595206e4fe7fcf6b542e7a1bdbe96101f0f010fc5be49f99baf2' - 'b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e' - '9fd93b899e03accd31ab357a70e538220c424ce8769e63a8b961fa627ab27c0a' - '3015cbbcd0527bef418c45febed7b18a97e1783901ecf9b3693024a9ee867138') + 'b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase Deleted: 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 2020-04-21 11:06:49 UTC (rev 380666) +++ drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch 2020-04-21 11:48:34 UTC (rev 380667) @@ -1,37 +0,0 @@ -From b2a7e9735ab2864330be9d00d7f38c961c28de5d Mon Sep 17 00:00:00 2001 -From: Prike Liang <prike.li...@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.li...@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.li...@amd.com> -Tested-by: Mengbing Wang <mengbing.w...@amd.com> -Tested-by: Paul Menzel <pmen...@molgen.mpg.de> -Acked-by: Alex Deucher <alexander.deuc...@amd.com> -Signed-off-by: Alex Deucher <alexander.deuc...@amd.com> -Cc: sta...@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman <gre...@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) Deleted: revert-acpi-ec-do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch =================================================================== --- revert-acpi-ec-do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch 2020-04-21 11:06:49 UTC (rev 380666) +++ revert-acpi-ec-do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch 2020-04-21 11:48:34 UTC (rev 380667) @@ -1,50 +0,0 @@ -From df541c011f5d731447d5c99fd77d77c2191d0c6d Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gre...@linuxfoundation.org> -Date: Sat, 18 Apr 2020 11:29:04 +0200 -Subject: Revert "ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add()" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Greg Kroah-Hartman <gre...@linuxfoundation.org> - -This reverts commit ce7a61a0d57d2dd613941d8aef82a5b54fb2e396 which is -commit 65a691f5f8f0bb63d6a82eec7b0ffd193d8d8a5f upstream. - -Rafael writes: - It has not been marked for -stable or otherwise requested to be - included AFAICS. Also it depends on other mainline commits that - have not been included into 5.6.5. - -Reported-by: Toralf Förster <toralf.foers...@gmx.de> -Reported-by: Rafael J. Wysocki <raf...@kernel.org> -Cc: Sasha Levin <sas...@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> ---- - drivers/acpi/ec.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - ---- a/drivers/acpi/ec.c -+++ b/drivers/acpi/ec.c -@@ -1573,6 +1573,7 @@ static int acpi_ec_add(struct acpi_devic - - if (boot_ec && ec->command_addr == boot_ec->command_addr && - ec->data_addr == boot_ec->data_addr) { -+ boot_ec_is_ecdt = false; - /* - * Trust PNP0C09 namespace location rather than - * ECDT ID. But trust ECDT GPE rather than _GPE -@@ -1592,12 +1593,9 @@ static int acpi_ec_add(struct acpi_devic - - if (ec == boot_ec) - acpi_handle_info(boot_ec->handle, -- "Boot %s EC initialization complete\n", -+ "Boot %s EC used to handle transactions and events\n", - boot_ec_is_ecdt ? "ECDT" : "DSDT"); - -- acpi_handle_info(ec->handle, -- "EC: Used to handle transactions and events\n"); -- - device->driver_data = ec; - - ret = !!request_region(ec->data_addr, 1, "EC data");
