Hi, On Mon, 2010-11-08 at 13:24 +0100, ext Archit Taneja wrote: > From: Sumit Semwal <sumit.semwal@xxxxxx> > > A new member 'channel' is introduced in omap_dss_device structure to determine > which channel the panel uses. The dispc functions used by interface drivers > (dsi, sdi etc) will use this member to differentiate between the 2 channels. > > The following dispc functions are changed to incorporate channel as an argument: > -dispc_enable_fifohandcheck() > -dispc_set_lcd_size() > -dispc_set_parallel_interface_mode() > -dispc_set_tft_data_lines() > -dispc_set_lcd_display_type() > -dispc_set_lcd_timings() > > The calls to these functions from the interface drivers have been changed to > incorporate the new channel argument. > > Signed-off-by: Sumit Semwal <sumit.semwal@xxxxxx> > Signed-off-by: Mukund Mittal <mmittal@xxxxxx> > Signed-off-by: Samreen <samreen@xxxxxx> > --- > arch/arm/plat-omap/include/plat/display.h | 1 + > drivers/video/omap2/dss/dispc.c | 49 ++++++++++++++++------------- > drivers/video/omap2/dss/dpi.c | 11 +++--- > drivers/video/omap2/dss/dsi.c | 13 ++++--- > drivers/video/omap2/dss/dss.h | 19 ++++++----- > drivers/video/omap2/dss/rfbi.c | 19 ++++++----- > drivers/video/omap2/dss/sdi.c | 14 +++++--- > 7 files changed, 70 insertions(+), 56 deletions(-) > > diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h > index 586944d..3e6eec1 100644 > --- a/arch/arm/plat-omap/include/plat/display.h > +++ b/arch/arm/plat-omap/include/plat/display.h > @@ -434,6 +434,7 @@ struct omap_dss_device { > struct omap_overlay_manager *manager; > > enum omap_dss_display_state state; > + enum omap_channel channel; Isn't this the same as dssdev->manager->id? Yes, this channel stuff is a bit confusing, even the enum "omap_channel" is badly named (should at least have "dss" in it). But omap_overlay_manager should represent the output pipe, so I don't think there's need for channel field in dss_device. I think in many places we could even pass omap_overlay_manager pointer around, instead of omap_channel. However, for low level dispc functions it's perhaps cleaner to pass the channel ID though. Tomi -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html