summaryrefslogtreecommitdiff
path: root/0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-11 09:50:43 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-10-11 09:50:43 -0700
commit21cb27d13ae796b89a61e4d3eeb5aa545a81963c (patch)
treeb2e965ab279114090ee66a075c9dc1405646841f /0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch
parentUpdated to 5.14.9 (diff)
downloadlinux-21cb27d13ae796b89a61e4d3eeb5aa545a81963c.tar.xz
Updated to 5.14.11
Add all missing config options as per stock/actual config diff.
Diffstat (limited to '0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch')
-rw-r--r--0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch23
1 files changed, 0 insertions, 23 deletions
diff --git a/0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch b/0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch
deleted file mode 100644
index 4275477..0000000
--- a/0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
-@@ -422,6 +422,9 @@ int amdgpu_debugfs_ring_init(struct amdgpu_device *adev,
- struct dentry *ent, *root = minor->debugfs_root;
- char name[32];
-
-+if (IS_ERR(root))
-+ return 0;
-+
- sprintf(name, "amdgpu_ring_%s", ring->name);
-
- ent = debugfs_create_file(name,
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
-@@ -2382,6 +2382,8 @@ void amdgpu_ttm_debugfs_init(struct amdgpu_device *adev)
- struct drm_minor *minor = adev_to_drm(adev)->primary;
- struct dentry *root = minor->debugfs_root;
-
-+ if (IS_ERR(root))
-+ return;
- debugfs_create_file_size("amdgpu_vram", 0444, root, adev,
- &amdgpu_ttm_vram_fops, adev->gmc.mc_vram_size);
- debugfs_create_file("amdgpu_iomem", 0444, root, adev,