Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1533572 > unrolled thread

[PATCH] drm/msm: adreno: fix build error without debugfs

Back to article view | Back to linux.kernel

Contents

  [PATCH] drm/msm: adreno: fix build error without debugfs Arnd Bergmann <arnd@arndb.de> - 2016-11-30 22:10 +0100
    Re: [PATCH] drm/msm: adreno: fix build error without debugfs Rob Clark <robdclark@gmail.com> - 2016-11-30 22:30 +0100

#1533572 — [PATCH] drm/msm: adreno: fix build error without debugfs

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")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index b8647198c11c..657874077400 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -846,7 +846,9 @@ static const struct adreno_gpu_funcs funcs = {
 		.idle = a5xx_idle,
 		.irq = a5xx_irq,
 		.destroy = a5xx_destroy,
+#ifdef CONFIG_DEBUG_FS
 		.show = a5xx_show,
+#endif
 	},
 	.get_timestamp = a5xx_get_timestamp,
 };
-- 
2.9.0

[toc] | [next] | [standalone]

#1533587

On Wed, Nov 30, 2016 at 4:06 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> 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")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

oh, whoops.. I guess kbuild robot didn't catch that..

well, first addition to msm-fixes-4.10 branch in case Dave doesn't
cherry-pick it first..

BR,
-R

> ---
>  drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
> index b8647198c11c..657874077400 100644
> --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
> @@ -846,7 +846,9 @@ static const struct adreno_gpu_funcs funcs = {
>                 .idle = a5xx_idle,
>                 .irq = a5xx_irq,
>                 .destroy = a5xx_destroy,
> +#ifdef CONFIG_DEBUG_FS
>                 .show = a5xx_show,
> +#endif
>         },
>         .get_timestamp = a5xx_get_timestamp,
>  };
> --
> 2.9.0
>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web