drm/armada: update armada overlay to use drm_universal_plane_init()
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 15 Jul 2015 17:11:24 +0000 (18:11 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 1 Oct 2015 13:32:52 +0000 (14:32 +0100)
Use the new drm_universal_plane_init() rather than the legacy
drm_plane_init().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/gpu/drm/armada/armada_overlay.c

index 5e2dcecbf6ef240484dcd70aa3994e918916822e..8f2b21693c76e656d360d31085ac68a3660cb5ff 100644 (file)
@@ -461,9 +461,11 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs)
        armada_drm_vbl_event_init(&dplane->vbl.update, armada_ovl_plane_vbl,
                                  dplane);
 
-       drm_plane_init(dev, &dplane->base, crtcs, &armada_ovl_plane_funcs,
-                      armada_ovl_formats, ARRAY_SIZE(armada_ovl_formats),
-                      false);
+       ret = drm_universal_plane_init(dev, &dplane->base, crtcs,
+                                      &armada_ovl_plane_funcs,
+                                      armada_ovl_formats,
+                                      ARRAY_SIZE(armada_ovl_formats),
+                                      DRM_PLANE_TYPE_OVERLAY);
        if (ret) {
                kfree(dplane);
                return ret;