summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/tilcdc
diff options
context:
space:
mode:
authorJyri Sarha2016-04-07 14:04:18 +0200
committerJyri Sarha2016-08-08 22:05:01 +0200
commit47f571c6e5d7b5f6021d6ade9607ecb6f28da5ad (patch)
treec9ec4e3aef18d1d0cbf2b0df9f8b0e63d824eb57 /drivers/gpu/drm/tilcdc
parentdrm/tilcdc: Add dummy primary plane implementation (diff)
downloadkernel-qcow2-linux-47f571c6e5d7b5f6021d6ade9607ecb6f28da5ad.tar.gz
kernel-qcow2-linux-47f571c6e5d7b5f6021d6ade9607ecb6f28da5ad.tar.xz
kernel-qcow2-linux-47f571c6e5d7b5f6021d6ade9607ecb6f28da5ad.zip
drm/tilcdc: Initialize dummy primary plane from crtc init
Initialize dummy primary plane from crtc init. Signed-off-by: Jyri Sarha <jsarha@ti.com>
Diffstat (limited to 'drivers/gpu/drm/tilcdc')
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_crtc.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index d9d2a6cc27c7..e762b4ed9308 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@ -26,6 +26,7 @@
struct tilcdc_crtc {
struct drm_crtc base;
+ struct drm_plane primary;
const struct tilcdc_panel_info *info;
struct drm_pending_vblank_event *event;
int dpms;
@@ -782,6 +783,10 @@ struct drm_crtc *tilcdc_crtc_create(struct drm_device *dev)
crtc = &tilcdc_crtc->base;
+ ret = tilcdc_plane_init(dev, &tilcdc_crtc->primary);
+ if (ret < 0)
+ goto fail;
+
tilcdc_crtc->dpms = DRM_MODE_DPMS_OFF;
init_waitqueue_head(&tilcdc_crtc->frame_done_wq);
@@ -790,7 +795,11 @@ struct drm_crtc *tilcdc_crtc_create(struct drm_device *dev)
spin_lock_init(&tilcdc_crtc->irq_lock);
- ret = drm_crtc_init(dev, crtc, &tilcdc_crtc_funcs);
+ ret = drm_crtc_init_with_planes(dev, crtc,
+ &tilcdc_crtc->primary,
+ NULL,
+ &tilcdc_crtc_funcs,
+ "tilcdc crtc");
if (ret < 0)
goto fail;