4 files changed, 10 insertions, 11 deletions

diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c
index eec13cea3144..bcc1c9533d67 100644
--- a/drivers/gpu/drm/sun4i/sun4i_crtc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c
@@ -28,6 +28,7 @@
 #include "sun4i_backend.h"
 #include "sun4i_crtc.h"
 #include "sun4i_drv.h"
+#include "sun4i_layer.h"
 #include "sun4i_tcon.h"
 
 static void sun4i_crtc_atomic_begin(struct drm_crtc *crtc,
@@ -149,6 +150,13 @@ struct sun4i_crtc *sun4i_crtc_init(struct drm_device *drm)
                 return ERR_PTR(-ENOMEM);
         scrtc->drv = drv;
 
+        /* Create our layers */
+        scrtc->layers = sun4i_layers_init(drm);
+        if (IS_ERR(scrtc->layers)) {
+                dev_err(drm->dev, "Couldn't create the planes\n");
+                return ERR_CAST(scrtc->layers);
+        }
+
         ret = drm_crtc_init_with_planes(drm, &scrtc->crtc,
                                         drv->primary,
                                         NULL,
diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.h b/drivers/gpu/drm/sun4i/sun4i_crtc.h
index dec8ce4d9b25..0a888f73c983 100644
--- a/drivers/gpu/drm/sun4i/sun4i_crtc.h
+++ b/drivers/gpu/drm/sun4i/sun4i_crtc.h
@@ -18,6 +18,7 @@ struct sun4i_crtc {
         struct drm_pending_vblank_event *event;
 
         struct sun4i_drv                *drv;
+        struct sun4i_layer              **layers;
 };
 
 static inline struct sun4i_crtc *drm_crtc_to_sun4i_crtc(struct drm_crtc *crtc)
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index 9adf1263e1e3..084c158611de 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -23,7 +23,7 @@
 #include "sun4i_crtc.h"
 #include "sun4i_drv.h"
 #include "sun4i_framebuffer.h"
-#include "sun4i_layer.h"
+#include "sun4i_tcon.h"
 
 static const struct file_operations sun4i_drv_fops = {
         .owner          = THIS_MODULE,
@@ -115,14 +115,6 @@ static int sun4i_drv_bind(struct device *dev)
                 goto cleanup_mode_config;
         }
 
-        /* Create our layers */
-        drv->layers = sun4i_layers_init(drm);
-        if (IS_ERR(drv->layers)) {
-                dev_err(drm->dev, "Couldn't create the planes\n");
-                ret = PTR_ERR(drv->layers);
-                goto cleanup_mode_config;
-        }
-
         /* Create our CRTC */
         drv->crtc = sun4i_crtc_init(drm);
         if (IS_ERR(drv->crtc)) {
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.h b/drivers/gpu/drm/sun4i/sun4i_drv.h
index 597353eab728..e22ee536677e 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.h
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.h
@@ -23,8 +23,6 @@ struct sun4i_drv {
 
         struct drm_plane        *primary;
         struct drm_fbdev_cma    *fbdev;
-
-        struct sun4i_layer      **layers;
 };
 
 #endif /* _SUN4I_DRV_H_ */