From patchwork Wed Sep 5 08:25:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 1406221 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id BA1FB40B02 for ; Wed, 5 Sep 2012 08:27:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754748Ab2IEI0v (ORCPT ); Wed, 5 Sep 2012 04:26:51 -0400 Received: from na3sys009aog136.obsmtp.com ([74.125.149.85]:44529 "EHLO na3sys009aog136.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758176Ab2IEI0j (ORCPT ); Wed, 5 Sep 2012 04:26:39 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]) (using TLSv1) by na3sys009aob136.postini.com ([74.125.148.12]) with SMTP ID DSNKUEcMvTcRiwPhMneZxV8eKP/lWvpH1Rdc@postini.com; Wed, 05 Sep 2012 01:26:39 PDT Received: by lbbgj3 with SMTP id gj3so189949lbb.19 for ; Wed, 05 Sep 2012 01:26:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=gFwQ2Ru5GgnG073uvDecfZ1aKGXVmDsHZaDsX2tQtBc=; b=HOPmnudlIzuJFyM2NJCUadAPGQiXL4qFgEoKpFpx+IL6pu5fp+6ZFrG8fL5WbcPorp MvJJTk8li73hv74D6e3lc3bF6TC96Wrb7Dx7usLOPF6OvT/5toROqbf2+qFbZInMyAGr wrkNJMuYDzF4AFXnpUXegDFg9anN2JxrCVc4hgMgsNFro9ip9GqY5x2+EnnKhuWX9hlx z1A6OxTvKwWkcQ/4HcbhbCroOkNJVZV36/B+DboXd8VrUj7W3uuT6YVctw0svi2ySw4M 20DwfaXOqMi9S0UMMipvi/IJjCRsNAYstvGFjq1YK4SGk7wsedvYxaSVC4HKdrv+59U1 nogQ== Received: by 10.112.84.105 with SMTP id x9mr7604069lby.92.1346833596451; Wed, 05 Sep 2012 01:26:36 -0700 (PDT) Received: from localhost.localdomain (a91-156-160-115.elisa-laajakaista.fi. [91.156.160.115]) by mx.google.com with ESMTPS id bc2sm279735lbb.3.2012.09.05.01.26.34 (version=SSLv3 cipher=OTHER); Wed, 05 Sep 2012 01:26:35 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, archit@ti.com Cc: Tomi Valkeinen Subject: [PATCH 14/17] Revert "OMAPDSS: APPLY: add fifo merge support funcs" Date: Wed, 5 Sep 2012 11:25:52 +0300 Message-Id: <1346833555-31258-15-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346833555-31258-1-git-send-email-tomi.valkeinen@ti.com> References: <1346833555-31258-1-git-send-email-tomi.valkeinen@ti.com> X-Gm-Message-State: ALoCoQkOGgm8pe9CZPUveaSBFhccA4T5MuaEqFKoIwxxWnFhxfc9SMIn4nxxBOuYP+TXxYJXsL74 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This reverts commit fb0119742291b6f30cd97026ee137b2d3d1f4de8. Adding fifo merge feature as an omapdss internal configuration was a mistake. We cannot hide from the users of omapdss the complexities of fifo merge. The previous commit removed fifo merge itself, and this removes the remaining fifo merge support functions. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/apply.c | 43 --------------------------------------- 1 file changed, 43 deletions(-) diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index 02943a5..32b5379 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c @@ -111,9 +111,6 @@ static struct { struct ovl_priv_data ovl_priv_data_array[MAX_DSS_OVERLAYS]; struct mgr_priv_data mgr_priv_data_array[MAX_DSS_MANAGERS]; - bool fifo_merge_dirty; - bool fifo_merge; - bool irq_enabled; } dss_data; @@ -677,40 +674,11 @@ static void dss_mgr_write_regs_extra(struct omap_overlay_manager *mgr) mp->shadow_extra_info_dirty = true; } -static void dss_write_regs_common(void) -{ - const int num_mgrs = omap_dss_get_num_overlay_managers(); - int i; - - if (!dss_data.fifo_merge_dirty) - return; - - for (i = 0; i < num_mgrs; ++i) { - struct omap_overlay_manager *mgr; - struct mgr_priv_data *mp; - - mgr = omap_dss_get_overlay_manager(i); - mp = get_mgr_priv(mgr); - - if (mp->enabled) { - if (dss_data.fifo_merge_dirty) { - dispc_enable_fifomerge(dss_data.fifo_merge); - dss_data.fifo_merge_dirty = false; - } - - if (mp->updating) - mp->shadow_info_dirty = true; - } - } -} - static void dss_write_regs(void) { const int num_mgrs = omap_dss_get_num_overlay_managers(); int i; - dss_write_regs_common(); - for (i = 0; i < num_mgrs; ++i) { struct omap_overlay_manager *mgr; struct mgr_priv_data *mp; @@ -799,8 +767,6 @@ void dss_mgr_start_update(struct omap_overlay_manager *mgr) dss_mgr_write_regs(mgr); dss_mgr_write_regs_extra(mgr); - dss_write_regs_common(); - mp->updating = true; if (!dss_data.irq_enabled && need_isr()) @@ -984,15 +950,6 @@ static void dss_apply_ovl_fifo_thresholds(struct omap_overlay *ovl, op->extra_info_dirty = true; } -static void dss_apply_fifo_merge(bool use_fifo_merge) -{ - if (dss_data.fifo_merge == use_fifo_merge) - return; - - dss_data.fifo_merge = use_fifo_merge; - dss_data.fifo_merge_dirty = true; -} - static void dss_ovl_setup_fifo(struct omap_overlay *ovl) { struct ovl_priv_data *op = get_ovl_priv(ovl);