summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/armada
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-07-15 19:11:24 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-10-01 15:32:52 +0200
commitd563c24514166d01b87cc96f92fe93b635d24c6e (patch)
treee748a29b549e3d55f14c0077a3786bfd5fc33af5 /drivers/gpu/drm/armada
parentdrm/armada: use xchg() to atomically update dplane->old_fb (diff)
downloadlinux-d563c24514166d01b87cc96f92fe93b635d24c6e.tar.xz
linux-d563c24514166d01b87cc96f92fe93b635d24c6e.zip
drm/armada: update armada overlay to use drm_universal_plane_init()
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>
Diffstat (limited to 'drivers/gpu/drm/armada')
-rw-r--r--drivers/gpu/drm/armada/armada_overlay.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
index 5e2dcecbf6ef..8f2b21693c76 100644
--- a/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@ -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;