Commit f3aabb64 authored by Philip Müller's avatar Philip Müller

[pkg-upd] 5.4.13-3

- fix issue: https://forum.manjaro.org/t/119741
parent bdc1785a
From eebc7f4d7ffa09f2a620bd1e2c67ddd579118af9 Mon Sep 17 00:00:00 2001
From: changzhu <Changfeng.Zhu@amd.com>
Date: Thu, 7 Nov 2019 14:09:27 +0800
Subject: [PATCH] drm/amdgpu: allow direct upload save restore list for raven2
It will cause modprobe atombios stuck problem in raven2 if it doesn't
allow direct upload save restore list from gfx driver.
So it needs to allow direct upload save restore list for raven2
temporarily.
Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index d88037424ec4..3ebd5c20dfd3 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -2738,7 +2738,9 @@ static void gfx_v9_0_init_pg(struct amdgpu_device *adev)
* And it's needed by gfxoff feature.
*/
if (adev->gfx.rlc.is_rlc_v2_1) {
- if (adev->asic_type == CHIP_VEGA12)
+ if (adev->asic_type == CHIP_VEGA12 ||
+ (adev->asic_type == CHIP_RAVEN &&
+ adev->rev_id >= 8))
gfx_v9_1_init_rlc_save_restore_list(adev);
gfx_v9_0_enable_save_restore_machine(adev);
}
--
2.17.1
......@@ -13,7 +13,7 @@ _basekernel=5.4
_basever=54
_aufs=20191223
pkgver=5.4.13
pkgrel=2
pkgrel=3
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
license=('GPL2')
......@@ -57,6 +57,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
'0001-nonupstream-navi10-vfio-reset.patch'
'0001-i2c-nuvoton-nc677x-hwmon-driver.patch'
'0001-revert-drm-i915-cmdparser-use-explicit-goto-for-error-paths.patch'
'0001-drm-amdgpu-allow-direct-upload-save-restore-list-for.patch'
# Bootsplash
'0001-bootsplash.patch'
'0002-bootsplash.patch'
......@@ -106,6 +107,7 @@ sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
'7a2758f86dd1339f0f1801de2dbea059b55bf3648e240878b11e6d6890d3089c'
'0556859a8168c8f7da9af8e2059d33216d9e5378d2cac70ca54c5ff843fa5add'
'35f351e0b10c0c8ce1e11d98f0d9941593e914fc04c98aaf46ffaf5b285f9368'
'835c1cf98281df44ead1fc76261a50ef322bb1809973d7ed166390cc6a200279'
'a504f6cf84094e08eaa3cc5b28440261797bf4f06f04993ee46a20628ff2b53c'
'e096b127a5208f56d368d2cb938933454d7200d70c86b763aa22c38e0ddb8717'
'8c1c880f2caa9c7ae43281a35410203887ea8eae750fe8d360d0c8bf80fcc6e0'
......@@ -138,6 +140,10 @@ prepare() {
patch -Np1 -i '../0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch'
patch -Np1 -i '../0003-mfd-intel-lpss-use-devm_ioremap_uc-for-MMIO.patch'
# https://gitlab.freedesktop.org/drm/amd/issues/1013
patch -Np1 -i '../0001-drm-amdgpu-allow-direct-upload-save-restore-list-for.patch'
# https://twitter.com/vskye11/status/1216240051639791616
patch -Np1 -i '../0001-i2c-nuvoton-nc677x-hwmon-driver.patch'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment