| Message ID | 1456161048-21240-41-git-send-email-tomi.valkeinen@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Tomi, Thank you for the patch. On Monday 22 February 2016 19:10:46 Tomi Valkeinen wrote: > We have now removed all uses of 'struct omap_overlay_manager', so we can > now remove the last places where it is set. Shouldn't you also move the definition of the structure to a header private to omapfb, as it's not used by omapdrm anymore ? > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > --- > drivers/gpu/drm/omapdrm/omap_crtc.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c > b/drivers/gpu/drm/omapdrm/omap_crtc.c index f195641b510c..932196e30024 > 100644 > --- a/drivers/gpu/drm/omapdrm/omap_crtc.c > +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c > @@ -98,8 +98,6 @@ static struct omap_dss_device *omap_crtc_output[8]; > static int omap_crtc_dss_connect(enum omap_channel channel, > struct omap_dss_device *dst) > { > - struct omap_overlay_manager *mgr = omap_dss_get_overlay_manager(channel); > - > if (omap_crtc_output[channel]) > return -EINVAL; > > @@ -109,22 +107,14 @@ static int omap_crtc_dss_connect(enum omap_channel > channel, omap_crtc_output[channel] = dst; > dst->dispc_channel_connected = true; > > - dst->manager = mgr; > - mgr->output = dst; > - > return 0; > } > > static void omap_crtc_dss_disconnect(enum omap_channel channel, > struct omap_dss_device *dst) > { > - struct omap_overlay_manager *mgr = omap_dss_get_overlay_manager(channel); > - > omap_crtc_output[channel] = NULL; > dst->dispc_channel_connected = false; > - > - mgr->output->manager = NULL; > - mgr->output = NULL; > } > > static void omap_crtc_dss_start_update(enum omap_channel channel)
On 07/03/16 11:01, Laurent Pinchart wrote: > Hi Tomi, > > Thank you for the patch. > > On Monday 22 February 2016 19:10:46 Tomi Valkeinen wrote: >> We have now removed all uses of 'struct omap_overlay_manager', so we can >> now remove the last places where it is set. > > Shouldn't you also move the definition of the structure to a header private to > omapfb, as it's not used by omapdrm anymore ? Yes if it was private to omapfb. Unfortunately omap_vout uses omapdss, and thus omap_overlay_manager. So more cleanup is needed... Tomi
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index f195641b510c..932196e30024 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -98,8 +98,6 @@ static struct omap_dss_device *omap_crtc_output[8]; static int omap_crtc_dss_connect(enum omap_channel channel, struct omap_dss_device *dst) { - struct omap_overlay_manager *mgr = omap_dss_get_overlay_manager(channel); - if (omap_crtc_output[channel]) return -EINVAL; @@ -109,22 +107,14 @@ static int omap_crtc_dss_connect(enum omap_channel channel, omap_crtc_output[channel] = dst; dst->dispc_channel_connected = true; - dst->manager = mgr; - mgr->output = dst; - return 0; } static void omap_crtc_dss_disconnect(enum omap_channel channel, struct omap_dss_device *dst) { - struct omap_overlay_manager *mgr = omap_dss_get_overlay_manager(channel); - omap_crtc_output[channel] = NULL; dst->dispc_channel_connected = false; - - mgr->output->manager = NULL; - mgr->output = NULL; } static void omap_crtc_dss_start_update(enum omap_channel channel)
We have now removed all uses of 'struct omap_overlay_manager', so we can now remove the last places where it is set. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/gpu/drm/omapdrm/omap_crtc.c | 10 ---------- 1 file changed, 10 deletions(-)