From d1470e61ddea5d7a31e79baef2b2c77e72272b13 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sun, 3 Oct 2021 21:10:28 -0700 Subject: Updated to 5.14.9 --- ...bfq-honor-already-setup-queue-merges-root.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create 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 new file mode 100644 index 0000000..4275477 --- /dev/null +++ b/0007-Revert-block-bfq-honor-already-setup-queue-merges-root.patch @@ -0,0 +1,23 @@ +--- 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