Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard...

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

diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
index 6d133149cc74873fd593aff0ae1aaa9362c29c31..827ec1a3040b202fc025a9d1b8af54e32b67726f 100644 (file)
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -335,9 +335,10 @@ struct drm_plane *drm_primary_helper_create_plane(struct drm_device *dev,
        }
 
        /* possible_crtc's will be filled in later by crtc_init */
-       ret = drm_plane_init(dev, primary, 0, &drm_primary_helper_funcs,
-                            formats, num_formats,
-                            DRM_PLANE_TYPE_PRIMARY);
+       ret = drm_universal_plane_init(dev, primary, 0,
+                                      &drm_primary_helper_funcs,
+                                      formats, num_formats,
+                                      DRM_PLANE_TYPE_PRIMARY);
        if (ret) {
                kfree(primary);
                primary = NULL;