* [PATCH RFC 03/11] drm/tilcdc: Initialize dummy plane from crtc init [not found] <cover.1460378231.git.jsarha@ti.com> @ 2016-04-11 16:46 ` Jyri Sarha 2016-04-11 16:51 ` Please ignore this (was: Re: [PATCH RFC 03/11] drm/tilcdc: Initialize dummy plane from crtc init) Jyri Sarha 0 siblings, 1 reply; 2+ messages in thread From: Jyri Sarha @ 2016-04-11 16:46 UTC (permalink / raw) To: dri-devel; +Cc: Jyri Sarha, tomi.valkeinen, laurent.pinchart Signed-off-by: Jyri Sarha <jsarha@ti.com> --- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c index 78466ed..6b39be7 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; @@ -162,7 +163,6 @@ static void tilcdc_crtc_destroy(struct drm_crtc *crtc) struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc); tilcdc_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); - of_node_put(crtc->port); drm_crtc_cleanup(crtc); drm_flip_work_cleanup(&tilcdc_crtc->unref_work); @@ -793,6 +793,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); @@ -802,7 +806,11 @@ struct drm_crtc *tilcdc_crtc_create(struct drm_device *dev) spin_lock_init(&tilcdc_crtc->irq_lock); INIT_WORK(&tilcdc_crtc->recover_work, tilcdc_crtc_recover_work); - 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; -- 1.9.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Please ignore this (was: Re: [PATCH RFC 03/11] drm/tilcdc: Initialize dummy plane from crtc init) 2016-04-11 16:46 ` [PATCH RFC 03/11] drm/tilcdc: Initialize dummy plane from crtc init Jyri Sarha @ 2016-04-11 16:51 ` Jyri Sarha 0 siblings, 0 replies; 2+ messages in thread From: Jyri Sarha @ 2016-04-11 16:51 UTC (permalink / raw) To: dri-devel; +Cc: tomi.valkeinen, laurent.pinchart Please ignore this. BR, Jyri On 04/11/16 19:46, Jyri Sarha wrote: > Signed-off-by: Jyri Sarha <jsarha@ti.com> > --- > drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c > index 78466ed..6b39be7 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; > @@ -162,7 +163,6 @@ static void tilcdc_crtc_destroy(struct drm_crtc *crtc) > struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc); > > tilcdc_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); > - > of_node_put(crtc->port); > drm_crtc_cleanup(crtc); > drm_flip_work_cleanup(&tilcdc_crtc->unref_work); > @@ -793,6 +793,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); > > @@ -802,7 +806,11 @@ struct drm_crtc *tilcdc_crtc_create(struct drm_device *dev) > spin_lock_init(&tilcdc_crtc->irq_lock); > INIT_WORK(&tilcdc_crtc->recover_work, tilcdc_crtc_recover_work); > > - 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; > > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-04-11 16:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1460378231.git.jsarha@ti.com>
2016-04-11 16:46 ` [PATCH RFC 03/11] drm/tilcdc: Initialize dummy plane from crtc init Jyri Sarha
2016-04-11 16:51 ` Please ignore this (was: Re: [PATCH RFC 03/11] drm/tilcdc: Initialize dummy plane from crtc init) Jyri Sarha
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.