summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/omapdrm/omap_drv.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2015-01-11 01:11:18 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2015-03-20 15:30:17 +0300
commitef6b0e0275387f79e6ad848d61dfcb1a4f962fc7 (patch)
tree5d6b2addfcf1f3c15ca08fd6687e1a1363a578c8 /drivers/gpu/drm/omapdrm/omap_drv.c
parent9c660b7ceb0f104c72c4857e9c3619819d387f1d (diff)
downloadlinux-ef6b0e0275387f79e6ad848d61dfcb1a4f962fc7.tar.xz
drm: omapdrm: Switch to the universal plane API
Remove the CRTC private planes by switching to the universal plane API. This results in a merge of the CRTC private plane created by the driver (omap_crtc->plane) and the CRTC primary plane created by the DRM core (crtc->primary). Reference counting of the framebuffers in the update plane operation is thus simplified as no reference needs to be stored in the private plane anymore. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_drv.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 021855605a1f..5eab83d7de15 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -135,7 +135,7 @@ static int omap_modeset_create_crtc(struct drm_device *dev, int id,
struct drm_plane *plane;
struct drm_crtc *crtc;
- plane = omap_plane_init(dev, id, true);
+ plane = omap_plane_init(dev, id, DRM_PLANE_TYPE_PRIMARY);
if (IS_ERR(plane))
return PTR_ERR(plane);
@@ -277,7 +277,7 @@ static int omap_modeset_init(struct drm_device *dev)
for (; id < num_ovls; id++) {
struct drm_plane *plane;
- plane = omap_plane_init(dev, id, false);
+ plane = omap_plane_init(dev, id, DRM_PLANE_TYPE_OVERLAY);
if (IS_ERR(plane))
return PTR_ERR(plane);