| Message ID | 20170306202722.9301-4-seanpaul@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 06, 2017 at 03:27:15PM -0500, Sean Paul wrote: > Fixes the following compilation error when CONFIG_DEBUG_FS undefined: > > CC [M] drivers/gpu/drm/msm/adreno/a5xx_gpu.o > ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:3: error: unknown field ‘show’ specified in initializer > ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:11: error: ‘a5xx_show’ undeclared here (not in a function) > ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:3: warning: excess elements in struct initializer [enabled by default] > ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:3: warning: (near initialization for ‘funcs.base’) [enabled by default] > make[5]: *** [drivers/gpu/drm/msm/adreno/a5xx_gpu.o] Error 1 > make[4]: *** [drivers/gpu/drm/msm] Error 2 > make[4]: *** Waiting for unfinished jobs.... > > Fixes: b5f103ab98c7 ("drm/msm: gpu: Add A5XX target support") > Cc: Jordan Crouse <jcrouse@codeaurora.org> > Cc: Rob Clark <robdclark@gmail.com> > Signed-off-by: Sean Paul <seanpaul@chromium.org> Yep, thats a paddlin'. Acked-by: Jordan Crouse <jcrouse@codeaurora.org> > --- > 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 4414cf73735d..f0c8bd74ca91 100644 > --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > @@ -860,7 +860,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.12.0.rc1.440.g5b76565f74-goog > > _______________________________________________ > Freedreno mailing list > Freedreno@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/freedreno
On 6 March 2017 at 20:27, Sean Paul <seanpaul@chromium.org> wrote: > Fixes the following compilation error when CONFIG_DEBUG_FS undefined: > > CC [M] drivers/gpu/drm/msm/adreno/a5xx_gpu.o > ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:3: error: unknown field ‘show’ specified in initializer > ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:11: error: ‘a5xx_show’ undeclared here (not in a function) > ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:3: warning: excess elements in struct initializer [enabled by default] > ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:3: warning: (near initialization for ‘funcs.base’) [enabled by default] > make[5]: *** [drivers/gpu/drm/msm/adreno/a5xx_gpu.o] Error 1 > make[4]: *** [drivers/gpu/drm/msm] Error 2 > make[4]: *** Waiting for unfinished jobs.... > > Fixes: b5f103ab98c7 ("drm/msm: gpu: Add A5XX target support") > Cc: Jordan Crouse <jcrouse@codeaurora.org> > Cc: Rob Clark <robdclark@gmail.com> > Signed-off-by: Sean Paul <seanpaul@chromium.org> > --- > 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 4414cf73735d..f0c8bd74ca91 100644 > --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > @@ -860,7 +860,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 A drm_compat_ioctl-like solution might be cleaner but this also works ;-) -Emil
On Mon, Mar 06, 2017 at 01:35:38PM -0700, Jordan Crouse wrote: > On Mon, Mar 06, 2017 at 03:27:15PM -0500, Sean Paul wrote: > > Fixes the following compilation error when CONFIG_DEBUG_FS undefined: > > > > CC [M] drivers/gpu/drm/msm/adreno/a5xx_gpu.o > > ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:3: error: unknown field ‘show’ specified in initializer > > ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:11: error: ‘a5xx_show’ undeclared here (not in a function) > > ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:3: warning: excess elements in struct initializer [enabled by default] > > ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:3: warning: (near initialization for ‘funcs.base’) [enabled by default] > > make[5]: *** [drivers/gpu/drm/msm/adreno/a5xx_gpu.o] Error 1 > > make[4]: *** [drivers/gpu/drm/msm] Error 2 > > make[4]: *** Waiting for unfinished jobs.... > > > > Fixes: b5f103ab98c7 ("drm/msm: gpu: Add A5XX target support") > > Cc: Jordan Crouse <jcrouse@codeaurora.org> > > Cc: Rob Clark <robdclark@gmail.com> > > Signed-off-by: Sean Paul <seanpaul@chromium.org> > > Yep, thats a paddlin'. > > Acked-by: Jordan Crouse <jcrouse@codeaurora.org> Applied to drm-misc-fixes Thanks, Sean > > > --- > > 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 4414cf73735d..f0c8bd74ca91 100644 > > --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > > +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > > @@ -860,7 +860,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.12.0.rc1.440.g5b76565f74-goog > > > > _______________________________________________ > > Freedreno mailing list > > Freedreno@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/freedreno > > -- > The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, > a Linux Foundation Collaborative Project > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c index 4414cf73735d..f0c8bd74ca91 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -860,7 +860,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, };
Fixes the following compilation error when CONFIG_DEBUG_FS undefined: CC [M] drivers/gpu/drm/msm/adreno/a5xx_gpu.o ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:3: error: unknown field ‘show’ specified in initializer ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:11: error: ‘a5xx_show’ undeclared here (not in a function) ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:3: warning: excess elements in struct initializer [enabled by default] ../drivers/gpu/drm/msm/adreno/a5xx_gpu.c:863:3: warning: (near initialization for ‘funcs.base’) [enabled by default] make[5]: *** [drivers/gpu/drm/msm/adreno/a5xx_gpu.o] Error 1 make[4]: *** [drivers/gpu/drm/msm] Error 2 make[4]: *** Waiting for unfinished jobs.... Fixes: b5f103ab98c7 ("drm/msm: gpu: Add A5XX target support") Cc: Jordan Crouse <jcrouse@codeaurora.org> Cc: Rob Clark <robdclark@gmail.com> Signed-off-by: Sean Paul <seanpaul@chromium.org> --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 ++ 1 file changed, 2 insertions(+)