From patchwork Mon Jul 19 11:55:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: archit taneja X-Patchwork-Id: 112650 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6JBu96J026385 for ; Mon, 19 Jul 2010 11:56:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760634Ab0GSL4H (ORCPT ); Mon, 19 Jul 2010 07:56:07 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:46552 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760631Ab0GSL4G (ORCPT ); Mon, 19 Jul 2010 07:56:06 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o6JBu2Sk009029 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 19 Jul 2010 06:56:02 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id o6JBtxPn023224; Mon, 19 Jul 2010 06:56:00 -0500 (CDT) Received: from localhost (omaplbp.india.ti.com [172.24.190.217]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o6JBtvP02510; Mon, 19 Jul 2010 06:55:57 -0500 (CDT) From: Archit Taneja To: tomi.valkeinen@nokia.com Cc: linux-omap@vger.kernel.org, Sumit Semwal , Mukund Mittal , Archit Taneja Subject: [PATCH 3/5] OMAP: DSS2: Add new overlay object for Video3 pipeline Date: Mon, 19 Jul 2010 17:25:42 +0530 Message-Id: <1279540544-12682-4-git-send-email-archit@ti.com> X-Mailer: git-send-email 1.5.4.7 In-Reply-To: <1279540544-12682-3-git-send-email-archit@ti.com> References: <1279540544-12682-1-git-send-email-archit@ti.com> <1279540544-12682-2-git-send-email-archit@ti.com> <1279540544-12682-3-git-send-email-archit@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 19 Jul 2010 11:56:09 +0000 (UTC) diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c index 96073f5..bccb7b6 --- a/drivers/video/omap2/dss/manager.c +++ b/drivers/video/omap2/dss/manager.c @@ -35,6 +35,7 @@ #include "dss.h" #define MAX_DSS_MANAGERS (cpu_is_omap44xx() ? 3 : 2) +#define MAX_DSS_OVERLAYS (cpu_is_omap44xx() ? 4 : 3) static int num_managers; static struct list_head manager_list; @@ -450,7 +451,7 @@ struct manager_cache_data { static struct { spinlock_t lock; - struct overlay_cache_data overlay_cache[3]; + struct overlay_cache_data overlay_cache[4]; struct manager_cache_data manager_cache[3]; bool irq_enabled; @@ -893,7 +894,7 @@ static int configure_dispc(void) { struct overlay_cache_data *oc; struct manager_cache_data *mc; - const int num_ovls = ARRAY_SIZE(dss_cache.overlay_cache); + const int num_ovls = MAX_DSS_OVERLAYS; const int num_mgrs = MAX_DSS_MANAGERS; int i; int r; @@ -1000,7 +1001,7 @@ void dss_setup_partial_planes(struct omap_dss_device *dssdev, { struct overlay_cache_data *oc; struct manager_cache_data *mc; - const int num_ovls = ARRAY_SIZE(dss_cache.overlay_cache); + const int num_ovls = MAX_DSS_OVERLAYS; struct omap_overlay_manager *mgr; int i; u16 x, y, w, h; @@ -1132,7 +1133,7 @@ void dss_start_update(struct omap_dss_device *dssdev) { struct manager_cache_data *mc; struct overlay_cache_data *oc; - const int num_ovls = ARRAY_SIZE(dss_cache.overlay_cache); + const int num_ovls = MAX_DSS_OVERLAYS; const int num_mgrs = MAX_DSS_MANAGERS; struct omap_overlay_manager *mgr; int i; @@ -1162,8 +1163,8 @@ static void dss_apply_irq_handler(void *data, u32 mask) { struct manager_cache_data *mc; struct overlay_cache_data *oc; - const int num_ovls = ARRAY_SIZE(dss_cache.overlay_cache); - const int num_mgrs = ARRAY_SIZE(dss_cache.manager_cache); + const int num_ovls = MAX_DSS_OVERLAYS; + const int num_mgrs = MAX_DSS_MANAGERS; int i, r; bool mgr_busy[MAX_DSS_MANAGERS]; diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c index 29aa157..2f8f89c --- a/drivers/video/omap2/dss/overlay.c +++ b/drivers/video/omap2/dss/overlay.c @@ -36,6 +36,8 @@ #include "dss.h" +#define MAX_DSS_OVERLAYS (cpu_is_omap44xx() ? 4 : 3) + static int num_overlays; static struct list_head overlay_list; @@ -510,11 +512,11 @@ static void omap_dss_add_overlay(struct omap_overlay *overlay) list_add_tail(&overlay->list, &overlay_list); } -static struct omap_overlay *dispc_overlays[3]; +static struct omap_overlay *dispc_overlays[4]; void dss_overlay_setup_dispc_manager(struct omap_overlay_manager *mgr) { - mgr->num_overlays = 3; + mgr->num_overlays = MAX_DSS_OVERLAYS; mgr->overlays = dispc_overlays; } @@ -535,7 +537,7 @@ void dss_init_overlays(struct platform_device *pdev) num_overlays = 0; - for (i = 0; i < 3; ++i) { + for (i = 0; i < MAX_DSS_OVERLAYS; ++i) { struct omap_overlay *ovl; ovl = kzalloc(sizeof(*ovl), GFP_KERNEL); @@ -571,6 +573,14 @@ void dss_init_overlays(struct platform_device *pdev) OMAP_DSS_OVL_CAP_DISPC; ovl->info.global_alpha = 255; break; + case 3: + ovl->name = "vid3"; + ovl->id = OMAP_DSS_VIDEO3; + ovl->supported_modes = OMAP_DSS_COLOR_VID3_OMAP3; + ovl->caps = OMAP_DSS_OVL_CAP_SCALE | + OMAP_DSS_OVL_CAP_DISPC; + ovl->info.global_alpha = 255; + break; } ovl->set_manager = &omap_dss_set_manager; @@ -661,7 +671,7 @@ void dss_recheck_connections(struct omap_dss_device *dssdev, bool force) } if (mgr) { - for (i = 0; i < 3; i++) { + for (i = 0; i < MAX_DSS_OVERLAYS; i++) { struct omap_overlay *ovl; ovl = omap_dss_get_overlay(i); if (!ovl->manager || force) {