RE: linux-next: build failure after merge of the drm-misc tree

[Biju Das]

Hi Geert,

Thanks for the feedback.

> -----Original Message-----
> From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
> Sent: Thursday, February 22, 2024 8:29 AM
> Subject: Re: linux-next: build failure after merge of the drm-misc tree
> 
> Hi Biju,
> 
> On Thu, Feb 22, 2024 at 9:14 AM Biju Das <biju.das.jz@xxxxxxxxxxxxxx>
> wrote:
> > > -----Original Message-----
> > > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > > Sent: Thursday, February 22, 2024 1:46 AM
> > > Subject: linux-next: build failure after merge of the drm-misc tree
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error:
> > > redefinition of 'rzg2l_du_vsp_enable'
> > >    47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > >       |      ^~~~~~~~~~~~~~~~~~~
> > > In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> > >                  from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> > > definition of 'rzg2l_du_vsp_enable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >    72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc
> > > *crtc) { };
> > >       |                    ^~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error:
> > > redefinition of 'rzg2l_du_vsp_disable'
> > >    61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> > >       |      ^~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> > > definition of 'rzg2l_du_vsp_disable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >    73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> > > *crtc) { };
> > >       |                    ^~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error:
> > > redefinition of 'rzg2l_du_vsp_atomic_flush'
> > >    66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> > >       |      ^~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> > > definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >    74 | static inline void rzg2l_du_vsp_atomic_flush(struct
> > > rzg2l_du_crtc
> > > *crtc) { };
> > >       |                    ^~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error:
> > > redefinition of 'rzg2l_du_vsp_get_drm_plane'
> > >    76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > >       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> > > definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct
> > > drm_plane *(struct rzg2l_du_crtc *, unsigned int)'
> > >    75 | static inline struct drm_plane
> > > *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > >       |                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error:
> > > redefinition of 'rzg2l_du_vsp_init'
> > >   302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct
> > > device_node *np,
> > >       |     ^~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> > > definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp
> > > *, struct device_node *, unsigned int)'
> > >    66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp
> > > *vsp, struct device_node *np,
> > >       |                   ^~~~~~~~~~~~~~~~~
> > >
> > > Caused by commit
> > >
> > >   768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> > >
> > > I have used the drm-misc tree from next-20240221 for today.
> >
> > I will send an incremental patch to fix this build error with x86 on
> drm-next.
> >
> > I need to use the macro #if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
> > in drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h to fix this error.
> 
> Looks like you're also missing an EXPORT_SYMBOL_GPL(rzg2l_du_vsp_enable)?

Yes, Will add this aswell, as CONFIG_VIDEO_RENESAS_VSP1=m for x86.

Cheers,
Biju