* [PATCH 0/3] Fix compile/link errors
@ 2017-03-06 20:27 Sean Paul
2017-03-06 20:27 ` [PATCH 1/3] drm: Fix compilation error when CONFIG_DEBUG_FS is undefined Sean Paul
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Sean Paul @ 2017-03-06 20:27 UTC (permalink / raw)
To: dri-devel
This set fixes 3 compile/linker errors when certain CONFIG options are not defined.
Sean Paul (3):
drm: Fix compilation error when CONFIG_DEBUG_FS is undefined
drm/rockchip: Fix link error when CONFIG_DRM_ANALOGIX_DP undefined
drm/msm: Fix compilation error when CONFIG_DEBUG_FS undefined
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 ++
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 10 ++++++++++
include/drm/drm_crtc.h | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
--
2.12.0.rc1.440.g5b76565f74-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/3] drm: Fix compilation error when CONFIG_DEBUG_FS is undefined 2017-03-06 20:27 [PATCH 0/3] Fix compile/link errors Sean Paul @ 2017-03-06 20:27 ` Sean Paul 2017-03-06 23:43 ` Sean Paul 2017-03-06 20:27 ` [PATCH 2/3] drm/rockchip: Fix link error when CONFIG_DRM_ANALOGIX_DP undefined Sean Paul [not found] ` <20170306202722.9301-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> 2 siblings, 1 reply; 11+ messages in thread From: Sean Paul @ 2017-03-06 20:27 UTC (permalink / raw) To: dri-devel; +Cc: Daniel Vetter, Tomeu Vizoso This patch fixes the following compilation error when CONFIG_DEBUG_FS is not defined. ../drivers/gpu/drm/drm_dp_helper.c: In function ‘drm_dp_aux_crc_work’: ../drivers/gpu/drm/drm_dp_helper.c:1029:13: error: ‘struct drm_crtc’ has no member named ‘crc’ ../drivers/gpu/drm/drm_dp_helper.c:1031:12: error: ‘struct drm_crtc’ has no member named ‘crc’ make[4]: *** [drivers/gpu/drm/drm_dp_helper.o] Error 1 make[4]: *** Waiting for unfinished jobs.... Fixes: 79c1da7c3bf7 ("drm/dp: add helpers for capture of frame CRCs") Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: David Airlie <airlied@linux.ie> Cc: dri-devel@lists.freedesktop.org Signed-off-by: Sean Paul <seanpaul@chromium.org> --- include/drm/drm_crtc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index bda9347554a1..cba29ffedafd 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -776,6 +776,7 @@ struct drm_crtc { * Debugfs directory for this CRTC. */ struct dentry *debugfs_entry; +#endif /** * @crc: @@ -783,7 +784,6 @@ struct drm_crtc { * Configuration settings of CRC capture. */ struct drm_crtc_crc crc; -#endif /** * @fence_context: -- 2.12.0.rc1.440.g5b76565f74-goog _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/3] drm: Fix compilation error when CONFIG_DEBUG_FS is undefined 2017-03-06 20:27 ` [PATCH 1/3] drm: Fix compilation error when CONFIG_DEBUG_FS is undefined Sean Paul @ 2017-03-06 23:43 ` Sean Paul 0 siblings, 0 replies; 11+ messages in thread From: Sean Paul @ 2017-03-06 23:43 UTC (permalink / raw) To: dri-devel; +Cc: Daniel Vetter, Tomeu Vizoso On Mon, Mar 06, 2017 at 03:27:13PM -0500, Sean Paul wrote: > This patch fixes the following compilation error when CONFIG_DEBUG_FS is not defined. > > ../drivers/gpu/drm/drm_dp_helper.c: In function ‘drm_dp_aux_crc_work’: > ../drivers/gpu/drm/drm_dp_helper.c:1029:13: error: ‘struct drm_crtc’ has no member named ‘crc’ > ../drivers/gpu/drm/drm_dp_helper.c:1031:12: error: ‘struct drm_crtc’ has no member named ‘crc’ > make[4]: *** [drivers/gpu/drm/drm_dp_helper.o] Error 1 > make[4]: *** Waiting for unfinished jobs.... > > Fixes: 79c1da7c3bf7 ("drm/dp: add helpers for capture of frame CRCs") > Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com> > Cc: Sean Paul <seanpaul@chromium.org> > Cc: Daniel Vetter <daniel.vetter@intel.com> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Cc: David Airlie <airlied@linux.ie> > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Sean Paul <seanpaul@chromium.org> Applied to drm-misc-next with Emil's R-b Sean > --- > include/drm/drm_crtc.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index bda9347554a1..cba29ffedafd 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -776,6 +776,7 @@ struct drm_crtc { > * Debugfs directory for this CRTC. > */ > struct dentry *debugfs_entry; > +#endif > > /** > * @crc: > @@ -783,7 +784,6 @@ struct drm_crtc { > * Configuration settings of CRC capture. > */ > struct drm_crtc_crc crc; > -#endif > > /** > * @fence_context: > -- > 2.12.0.rc1.440.g5b76565f74-goog _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/3] drm/rockchip: Fix link error when CONFIG_DRM_ANALOGIX_DP undefined 2017-03-06 20:27 [PATCH 0/3] Fix compile/link errors Sean Paul 2017-03-06 20:27 ` [PATCH 1/3] drm: Fix compilation error when CONFIG_DEBUG_FS is undefined Sean Paul @ 2017-03-06 20:27 ` Sean Paul 2017-03-06 20:58 ` Emil Velikov [not found] ` <20170306202722.9301-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> 2 siblings, 1 reply; 11+ messages in thread From: Sean Paul @ 2017-03-06 20:27 UTC (permalink / raw) To: dri-devel; +Cc: Tomeu Vizoso, Emil Velikov, linux-rockchip, linux-arm-kernel Fixes the following link error when CONFIG_DRM_ANALOGIX_DP is not defined: ERROR: "analogix_dp_start_crc" [drivers/gpu/drm/rockchip/rockchipdrm.ko] undefined! ERROR: "analogix_dp_stop_crc" [drivers/gpu/drm/rockchip/rockchipdrm.ko] undefined! Fixes: 3190e58dafaf ("drm/rockchip: Implement CRC debugfs API") Reported-by: Emil Velikov <emil.l.velikov@gmail.com> Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com> Cc: Mark Yao <mark.yao@rock-chips.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: Heiko Stuebner <heiko@sntech.de> Cc: dri-devel@lists.freedesktop.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Cc: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Sean Paul <seanpaul@chromium.org> --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 17ab16c4b922..2151e1cee4b4 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -19,7 +19,9 @@ #include <drm/drm_crtc_helper.h> #include <drm/drm_flip_work.h> #include <drm/drm_plane_helper.h> +#ifdef CONFIG_DRM_ANALOGIX_DP #include <drm/bridge/analogix_dp.h> +#endif #include <linux/kernel.h> #include <linux/module.h> @@ -1112,6 +1114,7 @@ static void vop_crtc_destroy_state(struct drm_crtc *crtc, kfree(s); } +#ifdef CONFIG_DRM_ANALOGIX_DP static struct drm_connector *vop_get_edp_connector(struct vop *vop) { struct drm_crtc *crtc = &vop->crtc; @@ -1150,6 +1153,13 @@ static int vop_crtc_set_crc_source(struct drm_crtc *crtc, return ret; } +#else +static int vop_crtc_set_crc_source(struct drm_crtc *crtc, + const char *source_name, size_t *values_cnt) +{ + return -ENODEV; +} +#endif static const struct drm_crtc_funcs vop_crtc_funcs = { .set_config = drm_atomic_helper_set_config, -- 2.12.0.rc1.440.g5b76565f74-goog _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 2/3] drm/rockchip: Fix link error when CONFIG_DRM_ANALOGIX_DP undefined 2017-03-06 20:27 ` [PATCH 2/3] drm/rockchip: Fix link error when CONFIG_DRM_ANALOGIX_DP undefined Sean Paul @ 2017-03-06 20:58 ` Emil Velikov 2017-03-06 23:15 ` Sean Paul 0 siblings, 1 reply; 11+ messages in thread From: Emil Velikov @ 2017-03-06 20:58 UTC (permalink / raw) To: Sean Paul; +Cc: Tomeu Vizoso, ML dri-devel, linux-rockchip, LAKML On 6 March 2017 at 20:27, Sean Paul <seanpaul@chromium.org> wrote: > Fixes the following link error when CONFIG_DRM_ANALOGIX_DP is not defined: > > ERROR: "analogix_dp_start_crc" [drivers/gpu/drm/rockchip/rockchipdrm.ko] undefined! > ERROR: "analogix_dp_stop_crc" [drivers/gpu/drm/rockchip/rockchipdrm.ko] undefined! > > Fixes: 3190e58dafaf ("drm/rockchip: Implement CRC debugfs API") > Reported-by: Emil Velikov <emil.l.velikov@gmail.com> > Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com> > Cc: Mark Yao <mark.yao@rock-chips.com> > Cc: Sean Paul <seanpaul@chromium.org> > Cc: Heiko Stuebner <heiko@sntech.de> > Cc: dri-devel@lists.freedesktop.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-rockchip@lists.infradead.org > Cc: Emil Velikov <emil.l.velikov@gmail.com> > Signed-off-by: Sean Paul <seanpaul@chromium.org> > --- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 17ab16c4b922..2151e1cee4b4 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -19,7 +19,9 @@ > #include <drm/drm_crtc_helper.h> > #include <drm/drm_flip_work.h> > #include <drm/drm_plane_helper.h> > +#ifdef CONFIG_DRM_ANALOGIX_DP > #include <drm/bridge/analogix_dp.h> > +#endif > > #include <linux/kernel.h> > #include <linux/module.h> > @@ -1112,6 +1114,7 @@ static void vop_crtc_destroy_state(struct drm_crtc *crtc, > kfree(s); > } > > +#ifdef CONFIG_DRM_ANALOGIX_DP > static struct drm_connector *vop_get_edp_connector(struct vop *vop) > { Similar to 3/3 adding stubs for analogix_dp_start_crc/analogix_dp_stop_crc will be shorter/cleaner than ifdef spaghetti. At the same these fix the problems so, for the series: Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> -Emil _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/3] drm/rockchip: Fix link error when CONFIG_DRM_ANALOGIX_DP undefined 2017-03-06 20:58 ` Emil Velikov @ 2017-03-06 23:15 ` Sean Paul 2017-03-06 23:44 ` Sean Paul 0 siblings, 1 reply; 11+ messages in thread From: Sean Paul @ 2017-03-06 23:15 UTC (permalink / raw) To: Emil Velikov; +Cc: LAKML, linux-rockchip, ML dri-devel, Tomeu Vizoso On Mon, Mar 06, 2017 at 08:58:14PM +0000, Emil Velikov wrote: > On 6 March 2017 at 20:27, Sean Paul <seanpaul@chromium.org> wrote: > > Fixes the following link error when CONFIG_DRM_ANALOGIX_DP is not defined: > > > > ERROR: "analogix_dp_start_crc" [drivers/gpu/drm/rockchip/rockchipdrm.ko] undefined! > > ERROR: "analogix_dp_stop_crc" [drivers/gpu/drm/rockchip/rockchipdrm.ko] undefined! > > > > Fixes: 3190e58dafaf ("drm/rockchip: Implement CRC debugfs API") > > Reported-by: Emil Velikov <emil.l.velikov@gmail.com> > > Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com> > > Cc: Mark Yao <mark.yao@rock-chips.com> > > Cc: Sean Paul <seanpaul@chromium.org> > > Cc: Heiko Stuebner <heiko@sntech.de> > > Cc: dri-devel@lists.freedesktop.org > > Cc: linux-arm-kernel@lists.infradead.org > > Cc: linux-rockchip@lists.infradead.org > > Cc: Emil Velikov <emil.l.velikov@gmail.com> > > Signed-off-by: Sean Paul <seanpaul@chromium.org> > > --- > > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 10 ++++++++++ > > 1 file changed, 10 insertions(+) > > > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > > index 17ab16c4b922..2151e1cee4b4 100644 > > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > > @@ -19,7 +19,9 @@ > > #include <drm/drm_crtc_helper.h> > > #include <drm/drm_flip_work.h> > > #include <drm/drm_plane_helper.h> > > +#ifdef CONFIG_DRM_ANALOGIX_DP > > #include <drm/bridge/analogix_dp.h> > > +#endif > > > > #include <linux/kernel.h> > > #include <linux/module.h> > > @@ -1112,6 +1114,7 @@ static void vop_crtc_destroy_state(struct drm_crtc *crtc, > > kfree(s); > > } > > > > +#ifdef CONFIG_DRM_ANALOGIX_DP > > static struct drm_connector *vop_get_edp_connector(struct vop *vop) > > { > Similar to 3/3 adding stubs for > analogix_dp_start_crc/analogix_dp_stop_crc will be shorter/cleaner > than ifdef spaghetti. > Thanks for the review, Emil. I think given that there's only one driver that supports crc in rockchip-land, it makes sense to target that driver specifically. If/when there is more than one, I agree we should have a shim/stub. That said, if Tomeu or anyone else wants to follow on with an ifdef cleanup, I'm happy to review. Sean > At the same these fix the problems so, for the series: > Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> > > -Emil > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/3] drm/rockchip: Fix link error when CONFIG_DRM_ANALOGIX_DP undefined 2017-03-06 23:15 ` Sean Paul @ 2017-03-06 23:44 ` Sean Paul 0 siblings, 0 replies; 11+ messages in thread From: Sean Paul @ 2017-03-06 23:44 UTC (permalink / raw) To: Emil Velikov; +Cc: LAKML, linux-rockchip, ML dri-devel, Tomeu Vizoso On Mon, Mar 06, 2017 at 06:15:12PM -0500, Sean Paul wrote: > On Mon, Mar 06, 2017 at 08:58:14PM +0000, Emil Velikov wrote: > > On 6 March 2017 at 20:27, Sean Paul <seanpaul@chromium.org> wrote: > > > Fixes the following link error when CONFIG_DRM_ANALOGIX_DP is not defined: > > > > > > ERROR: "analogix_dp_start_crc" [drivers/gpu/drm/rockchip/rockchipdrm.ko] undefined! > > > ERROR: "analogix_dp_stop_crc" [drivers/gpu/drm/rockchip/rockchipdrm.ko] undefined! > > > > > > Fixes: 3190e58dafaf ("drm/rockchip: Implement CRC debugfs API") > > > Reported-by: Emil Velikov <emil.l.velikov@gmail.com> > > > Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com> > > > Cc: Mark Yao <mark.yao@rock-chips.com> > > > Cc: Sean Paul <seanpaul@chromium.org> > > > Cc: Heiko Stuebner <heiko@sntech.de> > > > Cc: dri-devel@lists.freedesktop.org > > > Cc: linux-arm-kernel@lists.infradead.org > > > Cc: linux-rockchip@lists.infradead.org > > > Cc: Emil Velikov <emil.l.velikov@gmail.com> > > > Signed-off-by: Sean Paul <seanpaul@chromium.org> > > > --- > > > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 10 ++++++++++ > > > 1 file changed, 10 insertions(+) > > > > > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > > > index 17ab16c4b922..2151e1cee4b4 100644 > > > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > > > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > > > @@ -19,7 +19,9 @@ > > > #include <drm/drm_crtc_helper.h> > > > #include <drm/drm_flip_work.h> > > > #include <drm/drm_plane_helper.h> > > > +#ifdef CONFIG_DRM_ANALOGIX_DP > > > #include <drm/bridge/analogix_dp.h> > > > +#endif > > > > > > #include <linux/kernel.h> > > > #include <linux/module.h> > > > @@ -1112,6 +1114,7 @@ static void vop_crtc_destroy_state(struct drm_crtc *crtc, > > > kfree(s); > > > } > > > > > > +#ifdef CONFIG_DRM_ANALOGIX_DP > > > static struct drm_connector *vop_get_edp_connector(struct vop *vop) > > > { > > Similar to 3/3 adding stubs for > > analogix_dp_start_crc/analogix_dp_stop_crc will be shorter/cleaner > > than ifdef spaghetti. > > > > Thanks for the review, Emil. > > I think given that there's only one driver that supports crc in > rockchip-land, it makes sense to target that driver specifically. > If/when there is more than one, I agree we should have a shim/stub. > > That said, if Tomeu or anyone else wants to follow on with an ifdef > cleanup, I'm happy to review. > Applied to drm-misc-next Thanks for the review, Sean > Sean > > > At the same these fix the problems so, for the series: > > Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> > > > > -Emil > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <20170306202722.9301-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>]
* [PATCH 3/3] drm/msm: Fix compilation error when CONFIG_DEBUG_FS undefined [not found] ` <20170306202722.9301-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> @ 2017-03-06 20:27 ` Sean Paul 2017-03-06 20:35 ` [Freedreno] " Jordan Crouse [not found] ` <20170306202722.9301-4-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> 0 siblings, 2 replies; 11+ messages in thread From: Sean Paul @ 2017-03-06 20:27 UTC (permalink / raw) To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Cc: David Airlie, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA, Rob Clark, Eric Anholt, Jordan Crouse, Sean Paul, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW 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 }, .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 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [Freedreno] [PATCH 3/3] drm/msm: Fix compilation error when CONFIG_DEBUG_FS undefined 2017-03-06 20:27 ` [PATCH 3/3] drm/msm: Fix compilation error when CONFIG_DEBUG_FS undefined Sean Paul @ 2017-03-06 20:35 ` Jordan Crouse [not found] ` <20170306203537.GA20962-9PYrDHPZ2Orvke4nUoYGnHL1okKdlPRT@public.gmane.org> [not found] ` <20170306202722.9301-4-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> 1 sibling, 1 reply; 11+ messages in thread From: Jordan Crouse @ 2017-03-06 20:35 UTC (permalink / raw) To: Sean Paul; +Cc: linux-arm-msm, dri-devel, freedreno 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 -- 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <20170306203537.GA20962-9PYrDHPZ2Orvke4nUoYGnHL1okKdlPRT@public.gmane.org>]
* Re: [PATCH 3/3] drm/msm: Fix compilation error when CONFIG_DEBUG_FS undefined [not found] ` <20170306203537.GA20962-9PYrDHPZ2Orvke4nUoYGnHL1okKdlPRT@public.gmane.org> @ 2017-03-06 23:43 ` Sean Paul 0 siblings, 0 replies; 11+ messages in thread From: Sean Paul @ 2017-03-06 23:43 UTC (permalink / raw) To: Sean Paul, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, David Airlie, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA, Rob Clark, Eric Anholt, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW 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 _______________________________________________ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <20170306202722.9301-4-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>]
* Re: [PATCH 3/3] drm/msm: Fix compilation error when CONFIG_DEBUG_FS undefined [not found] ` <20170306202722.9301-4-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> @ 2017-03-06 20:51 ` Emil Velikov 0 siblings, 0 replies; 11+ messages in thread From: Emil Velikov @ 2017-03-06 20:51 UTC (permalink / raw) To: Sean Paul Cc: linux-arm-msm, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, ML dri-devel 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 _______________________________________________ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-03-06 23:44 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-06 20:27 [PATCH 0/3] Fix compile/link errors Sean Paul
2017-03-06 20:27 ` [PATCH 1/3] drm: Fix compilation error when CONFIG_DEBUG_FS is undefined Sean Paul
2017-03-06 23:43 ` Sean Paul
2017-03-06 20:27 ` [PATCH 2/3] drm/rockchip: Fix link error when CONFIG_DRM_ANALOGIX_DP undefined Sean Paul
2017-03-06 20:58 ` Emil Velikov
2017-03-06 23:15 ` Sean Paul
2017-03-06 23:44 ` Sean Paul
[not found] ` <20170306202722.9301-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2017-03-06 20:27 ` [PATCH 3/3] drm/msm: Fix compilation error when CONFIG_DEBUG_FS undefined Sean Paul
2017-03-06 20:35 ` [Freedreno] " Jordan Crouse
[not found] ` <20170306203537.GA20962-9PYrDHPZ2Orvke4nUoYGnHL1okKdlPRT@public.gmane.org>
2017-03-06 23:43 ` Sean Paul
[not found] ` <20170306202722.9301-4-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2017-03-06 20:51 ` Emil Velikov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).