From patchwork Thu Jun 9 13:56:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 865212 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p59Dv5m4009936 for ; Thu, 9 Jun 2011 13:58:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757936Ab1FIN5g (ORCPT ); Thu, 9 Jun 2011 09:57:36 -0400 Received: from na3sys009aog109.obsmtp.com ([74.125.149.201]:46266 "EHLO na3sys009aog109.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758081Ab1FIN5f (ORCPT ); Thu, 9 Jun 2011 09:57:35 -0400 Received: from mail-fx0-f49.google.com ([209.85.161.49]) (using TLSv1) by na3sys009aob109.postini.com ([74.125.148.12]) with SMTP ID DSNKTfDRTlYe/B19+ibDRy8iUuwAMmtCDiuP@postini.com; Thu, 09 Jun 2011 06:57:35 PDT Received: by fxm14 with SMTP id 14so1246863fxm.8 for ; Thu, 09 Jun 2011 06:57:33 -0700 (PDT) Received: by 10.223.94.129 with SMTP id z1mr840003fam.144.1307627853194; Thu, 09 Jun 2011 06:57:33 -0700 (PDT) Received: from localhost.localdomain (a62-248-131-233.elisa-laajakaista.fi [62.248.131.233]) by mx.google.com with ESMTPS id q10sm669900fan.8.2011.06.09.06.57.31 (version=SSLv3 cipher=OTHER); Thu, 09 Jun 2011 06:57:32 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: b-cousson@ti.com, paul@pwsan.com, khilman@ti.com, Tomi Valkeinen Subject: [PATCHv2 14/28] OMAP: DSS2: Remove CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET Date: Thu, 9 Jun 2011 16:56:36 +0300 Message-Id: <1307627810-3768-15-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1307627810-3768-1-git-send-email-tomi.valkeinen@ti.com> References: <1307627810-3768-1-git-send-email-tomi.valkeinen@ti.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 09 Jun 2011 13:58:09 +0000 (UTC) CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET is used to avoid an unclear bug at DSS reset time. The pm runtime will handle reset in the future, and this code has to be removed. Hopefully we won't see this error anymore. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/Kconfig | 12 ------------ drivers/video/omap2/dss/dss.c | 13 ------------- 2 files changed, 0 insertions(+), 25 deletions(-) diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig index 6b3e2da..0d12524 100644 --- a/drivers/video/omap2/dss/Kconfig +++ b/drivers/video/omap2/dss/Kconfig @@ -117,18 +117,6 @@ config OMAP2_DSS_MIN_FCK_PER_PCK Max FCK is 173MHz, so this doesn't work if your PCK is very high. -config OMAP2_DSS_SLEEP_BEFORE_RESET - bool "Sleep 50ms before DSS reset" - default y - help - For some unknown reason we may get SYNC_LOST errors from the display - subsystem at initialization time if we don't sleep before resetting - the DSS. See the source (dss.c) for more comments. - - However, 50ms is quite long time to sleep, and with some - configurations the SYNC_LOST may never happen, so the sleep can - be disabled here. - config OMAP2_DSS_SLEEP_AFTER_VENC_RESET bool "Sleep 20ms after VENC reset" default y diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index ff5664e..810ea8c 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c @@ -1037,19 +1037,6 @@ static int omap_dsshw_probe(struct platform_device *pdev) * the kernel resets it */ omap_writel(omap_readl(0x48050440) & ~0x3, 0x48050440); -#ifdef CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET - /* We need to wait here a bit, otherwise we sometimes start to - * get synclost errors, and after that only power cycle will - * restore DSS functionality. I have no idea why this happens. - * And we have to wait _before_ resetting the DSS, but after - * enabling clocks. - * - * This bug was at least present on OMAP3430. It's unknown - * if it happens on OMAP2 or OMAP3630. - */ - msleep(50); -#endif - _omap_dss_reset(); /* autoidle */