aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2838-drm-sched-move-fence-slab-handling-to-module-init-ex.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2838-drm-sched-move-fence-slab-handling-to-module-init-ex.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2838-drm-sched-move-fence-slab-handling-to-module-init-ex.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2838-drm-sched-move-fence-slab-handling-to-module-init-ex.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2838-drm-sched-move-fence-slab-handling-to-module-init-ex.patch
new file mode 100644
index 00000000..1c965e5e
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2838-drm-sched-move-fence-slab-handling-to-module-init-ex.patch
@@ -0,0 +1,58 @@
+From 03acb4601a0542c1861053c293f1589a250f8b34 Mon Sep 17 00:00:00 2001
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Wed, 6 Dec 2017 17:49:40 +0100
+Subject: [PATCH 2838/4131] drm/sched: move fence slab handling to module
+ init/exit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is the only part of the scheduler which must not be called from
+different drivers. Move it to module init/exit so it is done a single
+time when loading the scheduler.
+
+Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
+Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+index db27485..d80e695 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+@@ -900,10 +900,6 @@ static int __init amdgpu_init(void)
+ if (r)
+ goto error_fence;
+
+- r = drm_sched_fence_slab_init();
+- if (r)
+- goto error_sched;
+-
+ if (vgacon_text_force()) {
+ DRM_ERROR("VGACON disables amdgpu kernel modesetting.\n");
+ return -EINVAL;
+@@ -916,9 +912,6 @@ static int __init amdgpu_init(void)
+ /* let modprobe override vga console setting */
+ return pci_register_driver(pdriver);
+
+-error_sched:
+- amdgpu_fence_slab_fini();
+-
+ error_fence:
+ amdgpu_sync_fini();
+
+@@ -932,7 +925,6 @@ static void __exit amdgpu_exit(void)
+ pci_unregister_driver(pdriver);
+ amdgpu_unregister_atpx_handler();
+ amdgpu_sync_fini();
+- drm_sched_fence_slab_fini();
+ amdgpu_fence_slab_fini();
+ }
+
+--
+2.7.4
+