On Mon, Sep 19, 2016 at 04:33:44PM +0300, ville.syrjala@xxxxxxxxxxxxxxx wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> drm/drm_fb_helper.c:2306:12: warning: symbol 'drm_fb_helper_modinit' was not declared. Should it be static?
>
> While at it, move the lefover static inline to the right place.
>
> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
> Cc: Sean Paul <seanpaul@xxxxxxxxxxxx>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Merged the first 3 core patches to drm-misc. For the others a bit more
soaking time for maintainers to ack them I guess.
-Daniel
> ---
> drivers/gpu/drm/drm_crtc_helper_internal.h | 7 +++++++
> drivers/gpu/drm/drm_fb_helper.c | 2 ++
> include/drm/drm_fb_helper.h | 5 -----
> 3 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_crtc_helper_internal.h b/drivers/gpu/drm/drm_crtc_helper_internal.h
> index 4e6b57ae7188..28295e5d0d9e 100644
> --- a/drivers/gpu/drm/drm_crtc_helper_internal.h
> +++ b/drivers/gpu/drm/drm_crtc_helper_internal.h
> @@ -29,7 +29,14 @@
> #include <drm/drm_dp_helper.h>
>
> /* drm_fb_helper.c */
> +#ifdef CONFIG_DRM_FBDEV_EMULATION
> int drm_fb_helper_modinit(void);
> +#else
> +static inline int drm_fb_helper_modinit(void)
> +{
> + return 0;
> +}
> +#endif
>
> /* drm_dp_aux_dev.c */
> #ifdef CONFIG_DRM_DP_AUX_CHARDEV
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index dd8e3b68fd53..03414bde1f15 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -41,6 +41,8 @@
> #include <drm/drm_atomic.h>
> #include <drm/drm_atomic_helper.h>
>
> +#include "drm_crtc_helper_internal.h"
> +
> static bool drm_fbdev_emulation = true;
> module_param_named(fbdev_emulation, drm_fbdev_emulation, bool, 0600);
> MODULE_PARM_DESC(fbdev_emulation,
> diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
> index 797fb5f80c45..e19458dd1a43 100644
> --- a/include/drm/drm_fb_helper.h
> +++ b/include/drm/drm_fb_helper.h
> @@ -287,11 +287,6 @@ int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_
> int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,
> struct drm_connector *connector);
> #else
> -static inline int drm_fb_helper_modinit(void)
> -{
> - return 0;
> -}
> -
> static inline void drm_fb_helper_prepare(struct drm_device *dev,
> struct drm_fb_helper *helper,
> const struct drm_fb_helper_funcs *funcs)
> --
> 2.7.4
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
