]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Feb 2019 14:48:59 +0000 (15:48 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Feb 2019 14:48:59 +0000 (15:48 +0100)
added patches:
drm-msm-gpu-fix-building-without-debugfs.patch

queue-4.19/drm-msm-gpu-fix-building-without-debugfs.patch [new file with mode: 0644]
queue-4.19/series

diff --git a/queue-4.19/drm-msm-gpu-fix-building-without-debugfs.patch b/queue-4.19/drm-msm-gpu-fix-building-without-debugfs.patch
new file mode 100644 (file)
index 0000000..d6b7f06
--- /dev/null
@@ -0,0 +1,45 @@
+From c878a628e0c483ec36fa70f4590e4a58e34a6e49 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Mon, 13 Aug 2018 23:23:44 +0200
+Subject: drm/msm/gpu: fix building without debugfs
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit c878a628e0c483ec36fa70f4590e4a58e34a6e49 upstream.
+
+When debugfs is disabled, but coredump is turned on, the adreno driver fails to build:
+
+drivers/gpu/drm/msm/adreno/a3xx_gpu.c:460:4: error: 'struct msm_gpu_funcs' has no member named 'show'
+   .show = adreno_show,
+    ^~~~
+drivers/gpu/drm/msm/adreno/a3xx_gpu.c:460:11: note: (near initialization for 'funcs.base')
+drivers/gpu/drm/msm/adreno/a3xx_gpu.c:460:11: error: initialization of 'void (*)(struct msm_gpu *, struct msm_gem_submit *, struct msm_file_private *)' from incompatible pointer type 'void (*)(struct msm_gpu *, struct msm_gpu_state *, struct drm_printer *)' [-Werror=incompatible-pointer-types]
+drivers/gpu/drm/msm/adreno/a3xx_gpu.c:460:11: note: (near initialization for 'funcs.base.submit')
+drivers/gpu/drm/msm/adreno/a4xx_gpu.c:546:4: error: 'struct msm_gpu_funcs' has no member named 'show'
+drivers/gpu/drm/msm/adreno/a5xx_gpu.c:1460:4: error: 'struct msm_gpu_funcs' has no member named 'show'
+drivers/gpu/drm/msm/adreno/a6xx_gpu.c:769:4: error: 'struct msm_gpu_funcs' has no member named 'show'
+drivers/gpu/drm/msm/msm_gpu.c: In function 'msm_gpu_devcoredump_read':
+drivers/gpu/drm/msm/msm_gpu.c:289:12: error: 'const struct msm_gpu_funcs' has no member named 'show'
+
+Adjust the #ifdef to make it build again.
+
+Fixes: c0fec7f562ec ("drm/msm/gpu: Capture the GPU state on a GPU hang")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Rob Clark <robdclark@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/msm/msm_gpu.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/msm/msm_gpu.h
++++ b/drivers/gpu/drm/msm/msm_gpu.h
+@@ -63,7 +63,7 @@ struct msm_gpu_funcs {
+       struct msm_ringbuffer *(*active_ring)(struct msm_gpu *gpu);
+       void (*recover)(struct msm_gpu *gpu);
+       void (*destroy)(struct msm_gpu *gpu);
+-#ifdef CONFIG_DEBUG_FS
++#if defined(CONFIG_DEBUG_FS) || defined(CONFIG_DEV_COREDUMP)
+       /* show GPU status in debugfs: */
+       void (*show)(struct msm_gpu *gpu, struct msm_gpu_state *state,
+                       struct drm_printer *p);
index dd28db7345b518e10975c06dca9e7a9d4975ac1a..4a57c278689cc1a159a7a611620237d339bfc77b 100644 (file)
@@ -1 +1,2 @@
 fix-net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch
+drm-msm-gpu-fix-building-without-debugfs.patch