From patchwork Wed Dec 9 11:35:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Deepak M X-Patchwork-Id: 7804771 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 16895BEEE1 for ; Wed, 9 Dec 2015 06:01:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3D5DE204B0 for ; Wed, 9 Dec 2015 06:01:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4FE1A204A9 for ; Wed, 9 Dec 2015 06:01:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 77A376E88F; Tue, 8 Dec 2015 22:01:49 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id D3D1F6E88F for ; Tue, 8 Dec 2015 22:01:47 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP; 08 Dec 2015 22:01:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,402,1444719600"; d="scan'208";a="703230263" Received: from mdeepakubuntudesk01-desktop.iind.intel.com ([10.223.26.119]) by orsmga003.jf.intel.com with ESMTP; 08 Dec 2015 22:01:46 -0800 From: Deepak M To: intel-gfx@lists.freedesktop.org Date: Wed, 9 Dec 2015 17:05:52 +0530 Message-Id: <1449660952-25222-1-git-send-email-m.deepak@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <20151204112644.GP4437@intel.com> References: <20151204112644.GP4437@intel.com> Cc: Deepak M , Gaurav K Singh Subject: [Intel-gfx] [PATCH] drm/i915: Add DPI FIFO empty status check X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_03_06, RCVD_IN_DNSWL_MED,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Gaurav K Singh Before sending TURN ON packet,check the DPI FIFO empty status. v2: Change in commit message Checking for FIFO empty only during TURN ON packet. v3: Adding a new function for DPI FIFO empty check Signed-off-by: Gaurav K Singh Signed-off-by: Deepak M Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/i915/intel_dsi.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index 170ae6f..eff982b 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -60,6 +60,17 @@ static void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi, enum port port) DRM_ERROR("DPI FIFOs are not empty\n"); } +static void wait_for_dpi_fifo_empty(struct intel_dsi *intel_dsi, enum port port) +{ + struct drm_encoder *encoder = &intel_dsi->base.base; + struct drm_device *dev = encoder->dev; + struct drm_i915_private *dev_priv = dev->dev_private; + + if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & DPI_FIFO_EMPTY) + == DPI_FIFO_EMPTY, 50)) + DRM_ERROR("Timeout waiting for DPI FIFO empty\n"); +} + static void write_data(struct drm_i915_private *dev_priv, u32 reg, const u8 *data, u32 len) { @@ -443,8 +454,10 @@ static void intel_dsi_enable(struct intel_encoder *encoder) I915_WRITE(MIPI_MAX_RETURN_PKT_SIZE(port), 8 * 4); } else { msleep(20); /* XXX */ - for_each_dsi_port(port, intel_dsi->ports) + for_each_dsi_port(port, intel_dsi->ports) { + wait_for_dpi_fifo_empty(intel_dsi, port); dpi_send_cmd(intel_dsi, TURN_ON, false, port); + } msleep(100); drm_panel_enable(intel_dsi->panel);