From patchwork Wed Sep 5 08:25:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 1406171 Return-Path: X-Original-To: patchwork-linux-fbdev@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 38C3F40220 for ; Wed, 5 Sep 2012 08:27:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758186Ab2IEI0o (ORCPT ); Wed, 5 Sep 2012 04:26:44 -0400 Received: from na3sys009aog102.obsmtp.com ([74.125.149.69]:57188 "EHLO na3sys009aog102.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756559Ab2IEI0k (ORCPT ); Wed, 5 Sep 2012 04:26:40 -0400 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]) (using TLSv1) by na3sys009aob102.postini.com ([74.125.148.12]) with SMTP ID DSNKUEcMvzMaSW40aZGDn9S6bfQQFBPjBF7H@postini.com; Wed, 05 Sep 2012 01:26:40 PDT Received: by lagy9 with SMTP id y9so139482lag.19 for ; Wed, 05 Sep 2012 01:26:37 -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=0Ql6HPbeWxkiyiDf7uyU2KNHNc3pLW0c7GkaJdd6sTM=; b=JtG4/yN4+uGZhVBLnsP5J365rHgtbpxc9lbMl8BBaAJCKMCnTmJzg3T9XiQr7u25YP 9+5ku5v+1V2SogxXK8IXRZq9T+9agVSvHaDvbETP1Oux7vqEKWAjFduDXgiUajoIreCn PyhkGlXxGPUTtu1suIFFeM6B8QKEVkbrpGQA9KJvr5HM+j9A++hl4kVDIRykhqgBaK3U aoAZuFfE/hbe9kTyqpoQnFUA8hfU2+0gfLr/Cfr0efoekU8UYtTSQpMR+yBdQx/9Dt9y Lfl/71N/G9/qIVTx8SUVre8xAjqnZ0rlOR5a33mDJ43/55o+igiU9EUk9mKR7oEazFa/ dSQA== Received: by 10.112.47.133 with SMTP id d5mr7614585lbn.47.1346833597826; Wed, 05 Sep 2012 01:26:37 -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.36 (version=SSLv3 cipher=OTHER); Wed, 05 Sep 2012 01:26:37 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org, archit@ti.com Cc: Tomi Valkeinen Subject: [PATCH 15/17] OMAPDSS: remove extra_info completion code Date: Wed, 5 Sep 2012 11:25:53 +0300 Message-Id: <1346833555-31258-16-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: ALoCoQmAB6+gDgWqEj6FevloUqIQvJXe+rugAWVSSPOoZj8rnapPp5UuvWDoESwRAODhtGS8fUDJ Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Now that fifo merge has been removed, nobody uses the extra_info related completion code, which can be removed. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/apply.c | 69 --------------------------------------- 1 file changed, 69 deletions(-) diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index 32b5379..2579d15 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c @@ -118,7 +118,6 @@ static struct { static spinlock_t data_lock; /* lock for blocking functions */ static DEFINE_MUTEX(apply_lock); -static DECLARE_COMPLETION(extra_updated_completion); static void dss_register_vsync_isr(void); @@ -355,69 +354,6 @@ static bool need_go(struct omap_overlay_manager *mgr) return false; } -/* returns true if an extra_info field is currently being updated */ -static bool extra_info_update_ongoing(void) -{ - const int num_mgrs = dss_feat_get_num_mgrs(); - int i; - - for (i = 0; i < num_mgrs; ++i) { - struct omap_overlay_manager *mgr; - struct omap_overlay *ovl; - struct mgr_priv_data *mp; - - mgr = omap_dss_get_overlay_manager(i); - mp = get_mgr_priv(mgr); - - if (!mp->enabled) - continue; - - if (!mp->updating) - continue; - - if (mp->extra_info_dirty || mp->shadow_extra_info_dirty) - return true; - - list_for_each_entry(ovl, &mgr->overlays, list) { - struct ovl_priv_data *op = get_ovl_priv(ovl); - - if (op->extra_info_dirty || op->shadow_extra_info_dirty) - return true; - } - } - - return false; -} - -/* wait until no extra_info updates are pending */ -static void wait_pending_extra_info_updates(void) -{ - bool updating; - unsigned long flags; - unsigned long t; - int r; - - spin_lock_irqsave(&data_lock, flags); - - updating = extra_info_update_ongoing(); - - if (!updating) { - spin_unlock_irqrestore(&data_lock, flags); - return; - } - - init_completion(&extra_updated_completion); - - spin_unlock_irqrestore(&data_lock, flags); - - t = msecs_to_jiffies(500); - r = wait_for_completion_timeout(&extra_updated_completion, t); - if (r == 0) - DSSWARN("timeout in wait_pending_extra_info_updates\n"); - else if (r < 0) - DSSERR("wait_pending_extra_info_updates failed: %d\n", r); -} - int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr) { unsigned long timeout = msecs_to_jiffies(500); @@ -823,7 +759,6 @@ static void dss_apply_irq_handler(void *data, u32 mask) { const int num_mgrs = dss_feat_get_num_mgrs(); int i; - bool extra_updating; spin_lock(&data_lock); @@ -854,10 +789,6 @@ static void dss_apply_irq_handler(void *data, u32 mask) dss_write_regs(); dss_set_go_bits(); - extra_updating = extra_info_update_ongoing(); - if (!extra_updating) - complete_all(&extra_updated_completion); - if (!need_isr()) dss_unregister_vsync_isr();