* [PATCH] staging: imx-drm: Fix modular build of DRM_IMX_IPUV3
@ 2013-11-12 17:15 Josh Boyer
2013-11-18 9:03 ` Sascha Hauer
0 siblings, 1 reply; 6+ messages in thread
From: Josh Boyer @ 2013-11-12 17:15 UTC (permalink / raw)
To: Sascha Hauer, Philipp Zabel; +Cc: Dave Airlie, devel, Greg KH, linux-kernel
commit b8d181e408af (staging: drm/imx: add drm plane support) added a file
to the make target for DRM_IMX_IPUV3 but didn't adjust the objs required
to actually build that as a module. Kbuild got confused and this lead to
link errors like:
ERROR: "ipu_plane_disable" [drivers/staging/imx-drm/ipuv3-crtc.ko] undefined!
ERROR: "ipu_plane_enable" [drivers/staging/imx-drm/ipuv3-crtc.ko] undefined!
Additionally, it added a call to imx_drm_crtc_id which also fails with a
link error as above. To fix this, we adjust the make target with the proper
objs, which will change the name of the resulting .ko. We also add an
EXPORT_SYMBOL_GPL for imx_drm_crtc_id.
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
---
drivers/staging/imx-drm/Makefile | 4 +++-
drivers/staging/imx-drm/imx-drm-core.c | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/imx-drm/Makefile b/drivers/staging/imx-drm/Makefile
index 2c3a9e1..8742432 100644
--- a/drivers/staging/imx-drm/Makefile
+++ b/drivers/staging/imx-drm/Makefile
@@ -8,4 +8,6 @@ obj-$(CONFIG_DRM_IMX_TVE) += imx-tve.o
obj-$(CONFIG_DRM_IMX_LDB) += imx-ldb.o
obj-$(CONFIG_DRM_IMX_FB_HELPER) += imx-fbdev.o
obj-$(CONFIG_DRM_IMX_IPUV3_CORE) += ipu-v3/
-obj-$(CONFIG_DRM_IMX_IPUV3) += ipuv3-crtc.o ipuv3-plane.o
+
+imx-ipuv3-crtc-objs := ipuv3-crtc.o ipuv3-plane.o
+obj-$(CONFIG_DRM_IMX_IPUV3) += imx-ipuv3-crtc.o
diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
index 4483d47..2b366d8 100644
--- a/drivers/staging/imx-drm/imx-drm-core.c
+++ b/drivers/staging/imx-drm/imx-drm-core.c
@@ -72,6 +72,7 @@ int imx_drm_crtc_id(struct imx_drm_crtc *crtc)
{
return crtc->pipe;
}
+EXPORT_SYMBOL_GPL(imx_drm_crtc_id);
static void imx_drm_driver_lastclose(struct drm_device *drm)
{
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] staging: imx-drm: Fix modular build of DRM_IMX_IPUV3
2013-11-12 17:15 [PATCH] staging: imx-drm: Fix modular build of DRM_IMX_IPUV3 Josh Boyer
@ 2013-11-18 9:03 ` Sascha Hauer
2013-11-20 1:56 ` Josh Boyer
0 siblings, 1 reply; 6+ messages in thread
From: Sascha Hauer @ 2013-11-18 9:03 UTC (permalink / raw)
To: Josh Boyer; +Cc: Philipp Zabel, Dave Airlie, devel, Greg KH, linux-kernel
On Tue, Nov 12, 2013 at 12:15:45PM -0500, Josh Boyer wrote:
> commit b8d181e408af (staging: drm/imx: add drm plane support) added a file
> to the make target for DRM_IMX_IPUV3 but didn't adjust the objs required
> to actually build that as a module. Kbuild got confused and this lead to
> link errors like:
>
> ERROR: "ipu_plane_disable" [drivers/staging/imx-drm/ipuv3-crtc.ko] undefined!
> ERROR: "ipu_plane_enable" [drivers/staging/imx-drm/ipuv3-crtc.ko] undefined!
>
> Additionally, it added a call to imx_drm_crtc_id which also fails with a
> link error as above. To fix this, we adjust the make target with the proper
> objs, which will change the name of the resulting .ko. We also add an
> EXPORT_SYMBOL_GPL for imx_drm_crtc_id.
>
> Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha
> ---
> drivers/staging/imx-drm/Makefile | 4 +++-
> drivers/staging/imx-drm/imx-drm-core.c | 1 +
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/imx-drm/Makefile b/drivers/staging/imx-drm/Makefile
> index 2c3a9e1..8742432 100644
> --- a/drivers/staging/imx-drm/Makefile
> +++ b/drivers/staging/imx-drm/Makefile
> @@ -8,4 +8,6 @@ obj-$(CONFIG_DRM_IMX_TVE) += imx-tve.o
> obj-$(CONFIG_DRM_IMX_LDB) += imx-ldb.o
> obj-$(CONFIG_DRM_IMX_FB_HELPER) += imx-fbdev.o
> obj-$(CONFIG_DRM_IMX_IPUV3_CORE) += ipu-v3/
> -obj-$(CONFIG_DRM_IMX_IPUV3) += ipuv3-crtc.o ipuv3-plane.o
> +
> +imx-ipuv3-crtc-objs := ipuv3-crtc.o ipuv3-plane.o
> +obj-$(CONFIG_DRM_IMX_IPUV3) += imx-ipuv3-crtc.o
> diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
> index 4483d47..2b366d8 100644
> --- a/drivers/staging/imx-drm/imx-drm-core.c
> +++ b/drivers/staging/imx-drm/imx-drm-core.c
> @@ -72,6 +72,7 @@ int imx_drm_crtc_id(struct imx_drm_crtc *crtc)
> {
> return crtc->pipe;
> }
> +EXPORT_SYMBOL_GPL(imx_drm_crtc_id);
>
> static void imx_drm_driver_lastclose(struct drm_device *drm)
> {
> --
> 1.8.3.1
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] staging: imx-drm: Fix modular build of DRM_IMX_IPUV3
2013-11-18 9:03 ` Sascha Hauer
@ 2013-11-20 1:56 ` Josh Boyer
2013-11-20 5:39 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Josh Boyer @ 2013-11-20 1:56 UTC (permalink / raw)
To: Sascha Hauer; +Cc: Philipp Zabel, Dave Airlie, devel, Greg KH, linux-kernel
On Mon, Nov 18, 2013 at 10:03:10AM +0100, Sascha Hauer wrote:
> On Tue, Nov 12, 2013 at 12:15:45PM -0500, Josh Boyer wrote:
> > commit b8d181e408af (staging: drm/imx: add drm plane support) added a file
> > to the make target for DRM_IMX_IPUV3 but didn't adjust the objs required
> > to actually build that as a module. Kbuild got confused and this lead to
> > link errors like:
> >
> > ERROR: "ipu_plane_disable" [drivers/staging/imx-drm/ipuv3-crtc.ko] undefined!
> > ERROR: "ipu_plane_enable" [drivers/staging/imx-drm/ipuv3-crtc.ko] undefined!
> >
> > Additionally, it added a call to imx_drm_crtc_id which also fails with a
> > link error as above. To fix this, we adjust the make target with the proper
> > objs, which will change the name of the resulting .ko. We also add an
> > EXPORT_SYMBOL_GPL for imx_drm_crtc_id.
> >
> > Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
>
>
> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
>
> Sascha
Thanks. So who picks this fix up? Greg, is that you?
josh
>
> > ---
> > drivers/staging/imx-drm/Makefile | 4 +++-
> > drivers/staging/imx-drm/imx-drm-core.c | 1 +
> > 2 files changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/staging/imx-drm/Makefile b/drivers/staging/imx-drm/Makefile
> > index 2c3a9e1..8742432 100644
> > --- a/drivers/staging/imx-drm/Makefile
> > +++ b/drivers/staging/imx-drm/Makefile
> > @@ -8,4 +8,6 @@ obj-$(CONFIG_DRM_IMX_TVE) += imx-tve.o
> > obj-$(CONFIG_DRM_IMX_LDB) += imx-ldb.o
> > obj-$(CONFIG_DRM_IMX_FB_HELPER) += imx-fbdev.o
> > obj-$(CONFIG_DRM_IMX_IPUV3_CORE) += ipu-v3/
> > -obj-$(CONFIG_DRM_IMX_IPUV3) += ipuv3-crtc.o ipuv3-plane.o
> > +
> > +imx-ipuv3-crtc-objs := ipuv3-crtc.o ipuv3-plane.o
> > +obj-$(CONFIG_DRM_IMX_IPUV3) += imx-ipuv3-crtc.o
> > diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
> > index 4483d47..2b366d8 100644
> > --- a/drivers/staging/imx-drm/imx-drm-core.c
> > +++ b/drivers/staging/imx-drm/imx-drm-core.c
> > @@ -72,6 +72,7 @@ int imx_drm_crtc_id(struct imx_drm_crtc *crtc)
> > {
> > return crtc->pipe;
> > }
> > +EXPORT_SYMBOL_GPL(imx_drm_crtc_id);
> >
> > static void imx_drm_driver_lastclose(struct drm_device *drm)
> > {
> > --
> > 1.8.3.1
> >
> >
>
> --
> Pengutronix e.K. | |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] staging: imx-drm: Fix modular build of DRM_IMX_IPUV3
2013-11-20 1:56 ` Josh Boyer
@ 2013-11-20 5:39 ` Greg KH
2013-11-20 13:16 ` Josh Boyer
0 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2013-11-20 5:39 UTC (permalink / raw)
To: Josh Boyer; +Cc: Sascha Hauer, devel, Dave Airlie, linux-kernel, Philipp Zabel
On Tue, Nov 19, 2013 at 08:56:59PM -0500, Josh Boyer wrote:
> On Mon, Nov 18, 2013 at 10:03:10AM +0100, Sascha Hauer wrote:
> > On Tue, Nov 12, 2013 at 12:15:45PM -0500, Josh Boyer wrote:
> > > commit b8d181e408af (staging: drm/imx: add drm plane support) added a file
> > > to the make target for DRM_IMX_IPUV3 but didn't adjust the objs required
> > > to actually build that as a module. Kbuild got confused and this lead to
> > > link errors like:
> > >
> > > ERROR: "ipu_plane_disable" [drivers/staging/imx-drm/ipuv3-crtc.ko] undefined!
> > > ERROR: "ipu_plane_enable" [drivers/staging/imx-drm/ipuv3-crtc.ko] undefined!
> > >
> > > Additionally, it added a call to imx_drm_crtc_id which also fails with a
> > > link error as above. To fix this, we adjust the make target with the proper
> > > objs, which will change the name of the resulting .ko. We also add an
> > > EXPORT_SYMBOL_GPL for imx_drm_crtc_id.
> > >
> > > Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
> >
> >
> > Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> >
> > Sascha
>
> Thanks. So who picks this fix up? Greg, is that you?
Yes, I will once 3.13-rc1 is out.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] staging: imx-drm: Fix modular build of DRM_IMX_IPUV3
2013-11-20 5:39 ` Greg KH
@ 2013-11-20 13:16 ` Josh Boyer
2013-11-20 16:19 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Josh Boyer @ 2013-11-20 13:16 UTC (permalink / raw)
To: Greg KH; +Cc: Sascha Hauer, devel, Dave Airlie, linux-kernel, Philipp Zabel
On Tue, Nov 19, 2013 at 09:39:19PM -0800, Greg KH wrote:
> On Tue, Nov 19, 2013 at 08:56:59PM -0500, Josh Boyer wrote:
> > On Mon, Nov 18, 2013 at 10:03:10AM +0100, Sascha Hauer wrote:
> > > On Tue, Nov 12, 2013 at 12:15:45PM -0500, Josh Boyer wrote:
> > > > commit b8d181e408af (staging: drm/imx: add drm plane support) added a file
> > > > to the make target for DRM_IMX_IPUV3 but didn't adjust the objs required
> > > > to actually build that as a module. Kbuild got confused and this lead to
> > > > link errors like:
> > > >
> > > > ERROR: "ipu_plane_disable" [drivers/staging/imx-drm/ipuv3-crtc.ko] undefined!
> > > > ERROR: "ipu_plane_enable" [drivers/staging/imx-drm/ipuv3-crtc.ko] undefined!
> > > >
> > > > Additionally, it added a call to imx_drm_crtc_id which also fails with a
> > > > link error as above. To fix this, we adjust the make target with the proper
> > > > objs, which will change the name of the resulting .ko. We also add an
> > > > EXPORT_SYMBOL_GPL for imx_drm_crtc_id.
> > > >
> > > > Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
> > >
> > >
> > > Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> > >
> > > Sascha
> >
> > Thanks. So who picks this fix up? Greg, is that you?
>
> Yes, I will once 3.13-rc1 is out.
OK. And send it to Linus for 3.13-rc2? I know you've been traveling
and are busy, so I'm just pointing out it's a fix for 3.13.
josh
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] staging: imx-drm: Fix modular build of DRM_IMX_IPUV3
2013-11-20 13:16 ` Josh Boyer
@ 2013-11-20 16:19 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2013-11-20 16:19 UTC (permalink / raw)
To: Josh Boyer; +Cc: devel, Sascha Hauer, Dave Airlie, linux-kernel, Philipp Zabel
On Wed, Nov 20, 2013 at 08:16:32AM -0500, Josh Boyer wrote:
> On Tue, Nov 19, 2013 at 09:39:19PM -0800, Greg KH wrote:
> > On Tue, Nov 19, 2013 at 08:56:59PM -0500, Josh Boyer wrote:
> > > On Mon, Nov 18, 2013 at 10:03:10AM +0100, Sascha Hauer wrote:
> > > > On Tue, Nov 12, 2013 at 12:15:45PM -0500, Josh Boyer wrote:
> > > > > commit b8d181e408af (staging: drm/imx: add drm plane support) added a file
> > > > > to the make target for DRM_IMX_IPUV3 but didn't adjust the objs required
> > > > > to actually build that as a module. Kbuild got confused and this lead to
> > > > > link errors like:
> > > > >
> > > > > ERROR: "ipu_plane_disable" [drivers/staging/imx-drm/ipuv3-crtc.ko] undefined!
> > > > > ERROR: "ipu_plane_enable" [drivers/staging/imx-drm/ipuv3-crtc.ko] undefined!
> > > > >
> > > > > Additionally, it added a call to imx_drm_crtc_id which also fails with a
> > > > > link error as above. To fix this, we adjust the make target with the proper
> > > > > objs, which will change the name of the resulting .ko. We also add an
> > > > > EXPORT_SYMBOL_GPL for imx_drm_crtc_id.
> > > > >
> > > > > Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
> > > >
> > > >
> > > > Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > >
> > > > Sascha
> > >
> > > Thanks. So who picks this fix up? Greg, is that you?
> >
> > Yes, I will once 3.13-rc1 is out.
>
> OK. And send it to Linus for 3.13-rc2? I know you've been traveling
> and are busy, so I'm just pointing out it's a fix for 3.13.
Yes, it will be queued up for 3.13-final.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-11-20 16:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-12 17:15 [PATCH] staging: imx-drm: Fix modular build of DRM_IMX_IPUV3 Josh Boyer
2013-11-18 9:03 ` Sascha Hauer
2013-11-20 1:56 ` Josh Boyer
2013-11-20 5:39 ` Greg KH
2013-11-20 13:16 ` Josh Boyer
2013-11-20 16:19 ` Greg KH
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).