From 21cb27d13ae796b89a61e4d3eeb5aa545a81963c Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Mon, 11 Oct 2021 09:50:43 -0700 Subject: Updated to 5.14.11 Add all missing config options as per stock/actual config diff. --- ...bfq-honor-already-setup-queue-merges-root.patch | 23 ---------------------- 1 file changed, 23 deletions(-) delete mode 100644 0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch (limited to '0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch') 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, -- cgit v1.2.1