Message ID | 20170202193900.22075-1-krisman@collabora.co.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Feb 02, 2017 at 05:39:00PM -0200, Gabriel Krisman Bertazi wrote: > Commit be7f735cd5ea ("drm: Rely on mode_config data for fb_helper > initialization") broke the build when CONFIG_DRM_FBDEV_EMULATION is > disabled because it didn't update the prototype for drm_fb_helper_init > in that case. > > Fixes: be7f735cd5ea ("drm: Rely on mode_config data for fb_helper > initialization") > Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk> Oops. Applied, thanks for the quick fix. -Daniel > --- > include/drm/drm_fb_helper.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h > index 278820ee17ad..6f5acebb266a 100644 > --- a/include/drm/drm_fb_helper.h > +++ b/include/drm/drm_fb_helper.h > @@ -307,7 +307,7 @@ static inline void drm_fb_helper_prepare(struct drm_device *dev, > } > > static inline int drm_fb_helper_init(struct drm_device *dev, > - struct drm_fb_helper *helper, int crtc_count, > + struct drm_fb_helper *helper, > int max_conn) > { > return 0; > -- > 2.11.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 278820ee17ad..6f5acebb266a 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -307,7 +307,7 @@ static inline void drm_fb_helper_prepare(struct drm_device *dev, } static inline int drm_fb_helper_init(struct drm_device *dev, - struct drm_fb_helper *helper, int crtc_count, + struct drm_fb_helper *helper, int max_conn) { return 0;
Commit be7f735cd5ea ("drm: Rely on mode_config data for fb_helper initialization") broke the build when CONFIG_DRM_FBDEV_EMULATION is disabled because it didn't update the prototype for drm_fb_helper_init in that case. Fixes: be7f735cd5ea ("drm: Rely on mode_config data for fb_helper initialization") Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk> --- include/drm/drm_fb_helper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)