diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-07-15 13:11:24 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-10-01 09:32:52 -0400 |
commit | d563c24514166d01b87cc96f92fe93b635d24c6e (patch) | |
tree | e748a29b549e3d55f14c0077a3786bfd5fc33af5 | |
parent | 66377efa3fd468283a092f17692e81c2344b03ed (diff) |
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>
-rw-r--r-- | drivers/gpu/drm/armada/armada_overlay.c | 8 |
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) | |||
461 | armada_drm_vbl_event_init(&dplane->vbl.update, armada_ovl_plane_vbl, | 461 | armada_drm_vbl_event_init(&dplane->vbl.update, armada_ovl_plane_vbl, |
462 | dplane); | 462 | dplane); |
463 | 463 | ||
464 | drm_plane_init(dev, &dplane->base, crtcs, &armada_ovl_plane_funcs, | 464 | ret = drm_universal_plane_init(dev, &dplane->base, crtcs, |
465 | armada_ovl_formats, ARRAY_SIZE(armada_ovl_formats), | 465 | &armada_ovl_plane_funcs, |
466 | false); | 466 | armada_ovl_formats, |
467 | ARRAY_SIZE(armada_ovl_formats), | ||
468 | DRM_PLANE_TYPE_OVERLAY); | ||
467 | if (ret) { | 469 | if (ret) { |
468 | kfree(dplane); | 470 | kfree(dplane); |
469 | return ret; | 471 | return ret; |