| Message ID | 20161130210707.1768567-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 >
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, };
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(+)