Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / drm_fb_cma_helper.c

diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
index f27c883be391f51dfe0ef41e9cada8ed76ee67dc..cc0ae047ed3bd8fcc265e38a06d8ec86207deb55 100644 (file)
--- a/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
@@ -327,7 +327,7 @@ err_drm_gem_cma_free_object:
        return ret;
 }
 
-static struct drm_fb_helper_funcs drm_fb_cma_helper_funcs = {
+static const struct drm_fb_helper_funcs drm_fb_cma_helper_funcs = {
        .fb_probe = drm_fbdev_cma_create,
 };
 
@@ -354,9 +354,10 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device *dev,
                return ERR_PTR(-ENOMEM);
        }
 
-       fbdev_cma->fb_helper.funcs = &drm_fb_cma_helper_funcs;
        helper = &fbdev_cma->fb_helper;
 
+       drm_fb_helper_prepare(dev, helper, &drm_fb_cma_helper_funcs);
+
        ret = drm_fb_helper_init(dev, helper, num_crtc, max_conn_count);
        if (ret < 0) {
                dev_err(dev->dev, "Failed to initialize drm fb helper.\n");