Backmerge drm-fixes merge into Linus's tree into drm-next.

[linux-drm-fsl-dcu.git] / drivers / gpu / drm / exynos / exynos_drm_crtc.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index e69357172ffb56d2e5f5e86ff551b599196079ba..8f5ac535d8098137642afffec532b27d8eecbb57 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -96,7 +96,7 @@ static void exynos_crtc_atomic_flush(struct drm_crtc *crtc,
        }
 }
 
-static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = {
+static const struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = {
        .enable         = exynos_drm_crtc_enable,
        .disable        = exynos_drm_crtc_disable,
        .mode_set_nofb  = exynos_drm_crtc_mode_set_nofb,
@@ -116,7 +116,7 @@ static void exynos_drm_crtc_destroy(struct drm_crtc *crtc)
        kfree(exynos_crtc);
 }
 
-static struct drm_crtc_funcs exynos_crtc_funcs = {
+static const struct drm_crtc_funcs exynos_crtc_funcs = {
        .set_config     = drm_atomic_helper_set_config,
        .page_flip      = drm_atomic_helper_page_flip,
        .destroy        = exynos_drm_crtc_destroy,
@@ -153,7 +153,7 @@ struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev,
        private->crtc[pipe] = crtc;
 
        ret = drm_crtc_init_with_planes(drm_dev, crtc, plane, NULL,
-                                       &exynos_crtc_funcs);
+                                       &exynos_crtc_funcs, NULL);
        if (ret < 0)
                goto err_crtc;