Skip to contentSkip to conversation

Patch "drm/msm: adreno: fix build error without debugfs" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Apr 10, 2017

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/msm: adreno: fix build error without debugfs

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-msm-adreno-fix-build-error-without-debugfs.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 280489daa68bd20364b322c11e3f429a0212c611 Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Mon, 13 Mar 2017 17:43:48 +0100
Subject: drm/msm: adreno: fix build error without debugfs

From: Arnd Bergmann <[email protected]>

commit 280489daa68bd20364b322c11e3f429a0212c611 upstream.

The newly added a5xx support fails to build when debugfs is diabled:

drivers/gpu/drm/msm/adreno/a5xx_gpu.c:849:4: error: 'struct msm_gpu_funcs' has no member named 'show' drivers/gpu/drm/msm/adreno/a5xx_gpu.c:849:11: error: 'a5xx_show' undeclared here (not in a function); did you mean 'a5xx_irq'?

This adds a missing #ifdef.

Fixes b5f103ab98c7 ("drm/msm: gpu: Add A5XX target support")
---
 drivers/gpu/drm/msm/adreno/a5xx_gpu.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +2 -0
@@ -846,7 +846,9 @@ static const struct adreno_gpu_funcs fun
 		.idle = a5xx_idle,
 		.irq = a5xx_irq,
 		.destroy = a5xx_destroy,
+#ifdef CONFIG_DEBUG_FS
 		.show = a5xx_show,
+#endif
 	},
 	.get_timestamp = a5xx_get_timestamp,
 };

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/drm-msm-adreno-fix-build-error-without-debugfs.patch queue-4.10/mips-lantiq-fix-missing-xbar-kernel-panic.patch queue-4.10/kbuild-use-cc-disable-warning-consistently-for-maybe-uninitialized.patch