Fix the redefinition errors for the below functions on x86 by replacing CONFIG_DRM_RCAR_VSP->IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1) and adding EXPORT_SYMBOL_GPL for all: 1) rzg2l_du_vsp_init() 2) rzg2l_du_vsp_enable() 3) rzg2l_du_vsp_disable() 4) rzg2l_du_vsp_atomic_flush() 5) rzg2l_du_vsp_get_drm_plane() Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Closes: https://lore.kernel.org/linux-next/20240222124610.383e1ce3@xxxxxxxxxxxxxxxx/T/#u Signed-off-by: Biju Das <biju.das.jz@xxxxxxxxxxxxxx> --- drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 5 +++++ drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c index 0ae6331d6430..d0e597fb1459 100644 --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c @@ -57,11 +57,13 @@ void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc) vsp1_du_setup_lif(crtc->vsp->vsp, crtc->vsp_pipe, &cfg); } +EXPORT_SYMBOL_GPL(rzg2l_du_vsp_enable); void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc) { vsp1_du_setup_lif(crtc->vsp->vsp, crtc->vsp_pipe, NULL); } +EXPORT_SYMBOL_GPL(rzg2l_du_vsp_disable); void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc) { @@ -72,6 +74,7 @@ void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc) vsp1_du_atomic_flush(crtc->vsp->vsp, crtc->vsp_pipe, &cfg); } +EXPORT_SYMBOL_GPL(rzg2l_du_vsp_atomic_flush); struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc *crtc, unsigned int pipe_index) @@ -88,6 +91,7 @@ struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc *crtc, return plane ? plane : ERR_PTR(-EINVAL); } +EXPORT_SYMBOL_GPL(rzg2l_du_vsp_get_drm_plane); static const u32 rzg2l_du_vsp_formats[] = { DRM_FORMAT_RGB332, @@ -347,3 +351,4 @@ int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np, return 0; } +EXPORT_SYMBOL_GPL(rzg2l_du_vsp_init); diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h index 12d98f04bf89..322eb80dcbaf 100644 --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h @@ -54,7 +54,7 @@ to_rzg2l_vsp_plane_state(struct drm_plane_state *state) return container_of(state, struct rzg2l_du_vsp_plane_state, state); } -#ifdef CONFIG_DRM_RCAR_VSP +#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1) int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np, unsigned int crtcs); void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc); -- 2.25.1
