Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c74360f authored by Josh Boyer's avatar Josh Boyer Committed by Greg Kroah-Hartman
Browse files

staging: imx-drm: Fix modular build of DRM_IMX_IPUV3 



commit b8d181e4 (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: default avatarJosh Boyer <jwboyer@fedoraproject.org>
Fixes: b8d181e4 '(staging: drm/imx: add drm plane support)'
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8aced950

drivers/staging/imx-drm/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/imx-drm/imx-drm-core.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

{