From patchwork Wed Aug 31 13:21:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 1115912 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 p7VDML58022769 for ; Wed, 31 Aug 2011 13:22:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755721Ab1HaNWU (ORCPT ); Wed, 31 Aug 2011 09:22:20 -0400 Received: from na3sys009aog115.obsmtp.com ([74.125.149.238]:37074 "EHLO na3sys009aog115.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755693Ab1HaNWS (ORCPT ); Wed, 31 Aug 2011 09:22:18 -0400 Received: from mail-wy0-f179.google.com ([74.125.82.179]) (using TLSv1) by na3sys009aob115.postini.com ([74.125.148.12]) with SMTP ID DSNKTl41h++bFZ7MNA6GemelokY6yH/8YZsX@postini.com; Wed, 31 Aug 2011 06:22:18 PDT Received: by wyh21 with SMTP id 21so627045wyh.24 for ; Wed, 31 Aug 2011 06:22:13 -0700 (PDT) Received: by 10.227.116.67 with SMTP id l3mr368474wbq.94.1314796933773; Wed, 31 Aug 2011 06:22:13 -0700 (PDT) Received: from localhost.localdomain (a62-248-128-208.elisa-laajakaista.fi [62.248.128.208]) by mx.google.com with ESMTPS id fy13sm3685472wbb.56.2011.08.31.06.22.11 (version=SSLv3 cipher=OTHER); Wed, 31 Aug 2011 06:22:13 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: archit@ti.com, mythripk@ti.com, Tomi Valkeinen Subject: [PATCH 8/8] OMAP: DSS2: HDMI: fix hdmi output enable Date: Wed, 31 Aug 2011 16:21:48 +0300 Message-Id: <1314796908-17354-9-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314796908-17354-1-git-send-email-tomi.valkeinen@ti.com> References: <1314796908-17354-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]); Wed, 31 Aug 2011 13:22:22 +0000 (UTC) Enabling HDMI output often causes sync lost errors. The problem seems to go away if we first enable the HDMI output, and only then enable the DISPC output. This will also fix the dispc's dispc_mgr_enable_digit_out(), as the code waits for two VSYNCs after enabling the output. If the HDMI output is disabled (as it was previously), there are no VSYNCs and dispc_mgr_enable_digit_out() will print timeout errors. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/hdmi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index 504c507..d08096b 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -1184,10 +1184,10 @@ static int hdmi_power_on(struct omap_dss_device *dssdev) dispc_set_digit_size(dssdev->panel.timings.x_res, dssdev->panel.timings.y_res); - dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 1); - hdmi_wp_video_start(1); + dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, 1); + return 0; err: hdmi_runtime_put();