From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: archit@ti.com, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: [PATCH 6/8] OMAPDSS: cleanup dss_recheck_connections
Date: Wed, 19 Sep 2012 08:30:36 +0000 [thread overview]
Message-ID: <1348043438-2624-7-git-send-email-tomi.valkeinen@ti.com> (raw)
In-Reply-To: <1348043438-2624-1-git-send-email-tomi.valkeinen@ti.com>
dss_recheck_connections is quite a mess. With the previous commit that
initializes the channel field for HDMI and VENC displays, we can greatly
simplify the dss_recheck_connections.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/video/omap2/dss/overlay.c | 49 +++++--------------------------------
1 file changed, 6 insertions(+), 43 deletions(-)
diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c
index e3d4068..1bf05ef 100644
--- a/drivers/video/omap2/dss/overlay.c
+++ b/drivers/video/omap2/dss/overlay.c
@@ -109,52 +109,15 @@ void dss_init_overlays(struct platform_device *pdev)
* selected, connect always. */
void dss_recheck_connections(struct omap_dss_device *dssdev, bool force)
{
- int i;
- struct omap_overlay_manager *lcd_mgr;
- struct omap_overlay_manager *tv_mgr;
- struct omap_overlay_manager *lcd2_mgr = NULL;
- struct omap_overlay_manager *lcd3_mgr = NULL;
struct omap_overlay_manager *mgr = NULL;
+ int i;
- lcd_mgr = omap_dss_get_overlay_manager(OMAP_DSS_CHANNEL_LCD);
- tv_mgr = omap_dss_get_overlay_manager(OMAP_DSS_CHANNEL_DIGIT);
- if (dss_has_feature(FEAT_MGR_LCD3))
- lcd3_mgr = omap_dss_get_overlay_manager(OMAP_DSS_CHANNEL_LCD3);
- if (dss_has_feature(FEAT_MGR_LCD2))
- lcd2_mgr = omap_dss_get_overlay_manager(OMAP_DSS_CHANNEL_LCD2);
-
- if (dssdev->channel = OMAP_DSS_CHANNEL_LCD3) {
- if (!lcd3_mgr->device || force) {
- if (lcd3_mgr->device)
- lcd3_mgr->unset_device(lcd3_mgr);
- lcd3_mgr->set_device(lcd3_mgr, dssdev);
- mgr = lcd3_mgr;
- }
- } else if (dssdev->channel = OMAP_DSS_CHANNEL_LCD2) {
- if (!lcd2_mgr->device || force) {
- if (lcd2_mgr->device)
- lcd2_mgr->unset_device(lcd2_mgr);
- lcd2_mgr->set_device(lcd2_mgr, dssdev);
- mgr = lcd2_mgr;
- }
- } else if (dssdev->type != OMAP_DISPLAY_TYPE_VENC
- && dssdev->type != OMAP_DISPLAY_TYPE_HDMI) {
- if (!lcd_mgr->device || force) {
- if (lcd_mgr->device)
- lcd_mgr->unset_device(lcd_mgr);
- lcd_mgr->set_device(lcd_mgr, dssdev);
- mgr = lcd_mgr;
- }
- }
+ mgr = omap_dss_get_overlay_manager(dssdev->channel);
- if (dssdev->type = OMAP_DISPLAY_TYPE_VENC
- || dssdev->type = OMAP_DISPLAY_TYPE_HDMI) {
- if (!tv_mgr->device || force) {
- if (tv_mgr->device)
- tv_mgr->unset_device(tv_mgr);
- tv_mgr->set_device(tv_mgr, dssdev);
- mgr = tv_mgr;
- }
+ if (!mgr->device || force) {
+ if (mgr->device)
+ mgr->unset_device(mgr);
+ mgr->set_device(mgr, dssdev);
}
if (mgr) {
--
1.7.9.5
next prev parent reply other threads:[~2012-09-19 8:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-19 8:30 [PATCH 0/8] OMAPDSS: dss device model changes Tomi Valkeinen
2012-09-19 8:30 ` [PATCH 1/8] OMAPDSS: omap_dss_register_device() doesn't take display index Tomi Valkeinen
2012-09-19 8:30 ` [PATCH 2/8] OMAPDSS: Add dss_get_default_display_name() Tomi Valkeinen
2012-09-19 8:30 ` [PATCH 3/8] OMAPDSS: register only one display device per output Tomi Valkeinen
2012-09-19 8:30 ` [PATCH 4/8] OMAPDSS: explicitely initialize dssdev->channel for new displays Tomi Valkeinen
2012-09-19 8:30 ` [PATCH 5/8] OMAPDSS: handle errors in dss_init_device Tomi Valkeinen
2012-09-19 8:30 ` Tomi Valkeinen [this message]
2012-09-19 8:30 ` [PATCH 7/8] OMAPDSS: cleanup dss_recheck_connections further Tomi Valkeinen
2012-09-19 8:30 ` [PATCH 8/8] OMAPDSS: alloc dssdevs dynamically Tomi Valkeinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348043438-2624-7-git-send-email-tomi.valkeinen@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=archit@ti.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).