aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3311-drm-amdgpu-update-ras-sysfs-feature-info.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3311-drm-amdgpu-update-ras-sysfs-feature-info.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3311-drm-amdgpu-update-ras-sysfs-feature-info.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3311-drm-amdgpu-update-ras-sysfs-feature-info.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3311-drm-amdgpu-update-ras-sysfs-feature-info.patch
new file mode 100644
index 00000000..80a83a9d
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3311-drm-amdgpu-update-ras-sysfs-feature-info.patch
@@ -0,0 +1,51 @@
+From 1efbb5c26892e5bbdf6aa718a7361605f39ee8d9 Mon Sep 17 00:00:00 2001
+From: Tao Zhou <tao.zhou1@amd.com>
+Date: Mon, 5 Aug 2019 15:48:30 +0800
+Subject: [PATCH 3311/4256] drm/amdgpu: update ras sysfs feature info
+
+remove confused ras error type info
+
+Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
+Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+index d2e8a85f6e38..369651247b23 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+@@ -787,25 +787,18 @@ static ssize_t amdgpu_ras_sysfs_features_read(struct device *dev,
+ struct amdgpu_device *adev = ddev->dev_private;
+ struct ras_common_if head;
+ int ras_block_count = AMDGPU_RAS_BLOCK_COUNT;
+- int i;
++ int i, enabled;
+ ssize_t s;
+- struct ras_manager *obj;
+
+ s = scnprintf(buf, PAGE_SIZE, "feature mask: 0x%x\n", con->features);
+
+ for (i = 0; i < ras_block_count; i++) {
+ head.block = i;
++ enabled = amdgpu_ras_is_feature_enabled(adev, &head);
+
+- if (amdgpu_ras_is_feature_enabled(adev, &head)) {
+- obj = amdgpu_ras_find_obj(adev, &head);
+- s += scnprintf(&buf[s], PAGE_SIZE - s,
+- "%s: %s\n",
+- ras_block_str(i),
+- ras_err_str(obj->head.type));
+- } else
+- s += scnprintf(&buf[s], PAGE_SIZE - s,
+- "%s: disabled\n",
+- ras_block_str(i));
++ s += scnprintf(&buf[s], PAGE_SIZE - s,
++ "%s ras feature mask: %s\n",
++ ras_block_str(i), enabled?"on":"off");
+ }
+
+ return s;
+--
+2.17.1
+