diff options
| -rw-r--r-- | 0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch | 53 | ||||
| -rw-r--r-- | 0003-drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch | 39 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
3 files changed, 3 insertions, 101 deletions
diff --git a/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch b/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch deleted file mode 100644 index b30143c..0000000 --- a/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e5016d0b5460c3bed8f78033723ad22775db7725 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@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 - -This reverts commit 281e612b4b9587c0c72e30c49ec279587b20da0f 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.foerster@gmx.de> -Reported-by: Rafael J. Wysocki <rafael@kernel.org> -Cc: Sasha Levin <sashal@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/acpi/ec.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c -index 29b8fa618a02..35dd2f1fb0e6 100644 ---- a/drivers/acpi/ec.c -+++ b/drivers/acpi/ec.c -@@ -1646,6 +1646,7 @@ static int acpi_ec_add(struct acpi_device *device) - - 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 -@@ -1665,12 +1666,9 @@ static int acpi_ec_add(struct acpi_device *device) - - 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"); --- -cgit v1.2.3-1-gf6bb5 - diff --git a/0003-drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch b/0003-drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch deleted file mode 100644 index bbe177a..0000000 --- a/0003-drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1f8782c04f587b9e0901f7736c112814dd0dcc47 Mon Sep 17 00:00:00 2001 -From: Prike Liang <Prike.Liang@amd.com> -Date: Mon, 13 Apr 2020 21:41:14 +0800 -Subject: drm/amdgpu: fix the hw hang during perform system reboot and reset - -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@amd.com> -Tested-by: Mengbing Wang <Mengbing.Wang@amd.com> -Tested-by: Paul Menzel <pmenzel@molgen.mpg.de> -Acked-by: Alex Deucher <alexander.deucher@amd.com> -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -index 48e2863461b7..c8bf9cb3cebf 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -@@ -2285,6 +2285,8 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev) - { - 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) --- -cgit v1.2.3-1-gf6bb5 - @@ -13,7 +13,7 @@ pkgbase=linux-libre _supver=5 _majver=6 -_minver=5 +_minver=6 _gccpatchver='20191217' _gccpatchger='9.1' _gccpatchker='5.5' @@ -22,7 +22,7 @@ _gccpatchker='5.5' else pkgver=${_supver}.${_majver}.${_minver} fi -pkgrel=3 +pkgrel=1 pkgdesc='Linux-libre' url='https://linux-libre.fsfla.org/' arch=(x86_64) @@ -39,8 +39,6 @@ _gnupkgver=${pkgver}-gnu source=( https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign} 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch - 0003-drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch graysky_bdver2-hotfix.patch kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz ath9k-regdom-hack.patch @@ -57,15 +55,13 @@ validpgpkeys=( b2sums=('921a3836ffbd5ababb897b8d923ab3e97c10c39b8d01060fe41742005f8111b5c2c9e76c9b7bcf4fe59a056454a364eca5df8006ca8a174205df152007e18dff' 'SKIP' 'ab1fb19c67d4c107f75767581c33d9c1458b4d9fdb88f4adb41d30a36f5a2f95f1c48ef079eb87e1e6e8ce2f98b293195cb2c0f2a8ec975aa817453289158c6e' - '4ffbef601d902432e13c9012e3b46f0321c6277aa36a2bc23b2929e6404d0171e881e4b367d29ac7eb02b6c0d9faa06f152d27fdb88f76aa0c27e68c51b466e8' - '641284ba5239e23ad7e0f74ca101ba37938c39b46eb3dd90bd8c85cd6feef217ce3b326687c43c52fd984c1fa305e092a3b81a18b02571b36e4152c0bff2f9a9' '1892bd22775eac3bcc4d37f4fd30c95346bf3a0888cbbff57fd614973b525390dff2e315ce35b2e498523cceaab94ff21a80475dee8df3de4dd8fc0fab07d74e' 'd76bd0bf237ea2bb7999fd3715cb664d89148cb0ade8057d57cdb40bc0a7954336e50ee077312e5e192398b0f35f055786deb98af9130d57e60f2ea040fbb66f' '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd' 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a' 'a65080daea6fb37255c6bd4e78c06c2b276b602ab7c06bb302eb4fb2d9702d6bc22ba6147b8062ed880524a336a4da92d3cb6abb7aa0bbbed46ad3bd29ec445f' 'b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95' - 'dfa458eea739916884b3a606f845d44bed661589abe89502b3cf35cfa911683e8715b9ce198645f48c57ee3bf4b9cc26ac0722a2e0a6c01d5cd1017ed199a880' + '0e77b111a82223f97e1e61e3eb5289adfdcf6b110d024979b8b053a024f17fdcec4c8d5835c624d74be1c1bb396d86282c340cddb9fad02b39a3c4b9215eadaf' 'SKIP') #export KBUILD_BUILD_HOST=arc4linux @@ -85,8 +81,6 @@ prepare() { # Hotfixes echo "Applying hotfixes" patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - patch -p1 -i ../0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch - patch -p1 -i ../0003-drm-amdgpu-fix-the-hw-hang-during-perform-system-reboot-and-reset.patch patch -p1 -i ../sphinx-workaround.patch |