From patchwork Wed Feb 8 10:50:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Srinivas, Vidya" X-Patchwork-Id: 9562171 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9C8F860434 for ; Wed, 8 Feb 2017 10:39:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EC632094F for ; Wed, 8 Feb 2017 10:39:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83E4E28488; Wed, 8 Feb 2017 10:39:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1C06E2094F for ; Wed, 8 Feb 2017 10:39:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A9D446E82C; Wed, 8 Feb 2017 10:39:11 +0000 (UTC) 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 ESMTPS id 5CD2D6E82C for ; Wed, 8 Feb 2017 10:39:10 +0000 (UTC) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP; 08 Feb 2017 02:39:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,346,1477983600"; d="scan'208";a="222748268" Received: from vsrini4-ubuntu-intel.iind.intel.com ([10.223.26.91]) by fmsmga004.fm.intel.com with ESMTP; 08 Feb 2017 02:39:08 -0800 From: Vidya Srinivas To: intel-gfx@lists.freedesktop.org Date: Wed, 8 Feb 2017 16:20:55 +0530 Message-Id: <1486551058-22596-7-git-send-email-vidya.srinivas@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1486551058-22596-1-git-send-email-vidya.srinivas@intel.com> References: <1486551058-22596-1-git-send-email-vidya.srinivas@intel.com> Cc: jani.nikula@intel.com, Vidya Srinivas Subject: [Intel-gfx] [PATCH 6/9] drm/i915/bxt: Fix BXT DSI disable sequence 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-Virus-Scanned: ClamAV using ClamSMTP From: Uma Shankar Fix BXT DSI disable sequence as per latest updates in BSpec. Signed-off-by: Uma Shankar Signed-off-by: Vidya Srinivas --- drivers/gpu/drm/i915/intel_dsi.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index 538755b..808158f 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -632,8 +632,10 @@ static void intel_dsi_disable(struct intel_encoder *encoder) for_each_dsi_port(port, intel_dsi->ports) wait_for_dsi_fifo_empty(intel_dsi, port); - intel_dsi_port_disable(encoder); - msleep(2); + if (!IS_BROXTON(dev_priv)) { + intel_dsi_port_disable(encoder); + usleep_range(2000, 2500); + } } for_each_dsi_port(port, intel_dsi->ports) { @@ -641,7 +643,11 @@ static void intel_dsi_disable(struct intel_encoder *encoder) I915_WRITE(MIPI_DEVICE_READY(port), 0x0); intel_dsi_reset_clocks(encoder, port); - I915_WRITE(MIPI_EOT_DISABLE(port), CLOCKSTOP); + temp = 0; + if (intel_dsi->clock_stop) { + temp |= CLOCKSTOP; + I915_WRITE(MIPI_EOT_DISABLE(port), temp); + } temp = I915_READ(MIPI_DSI_FUNC_PRG(port)); temp &= ~VID_MODE_FORMAT_MASK; @@ -707,12 +713,25 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder, struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); u32 val; + enum port port; DRM_DEBUG_KMS("\n"); intel_dsi_disable(encoder); - intel_dsi_clear_device_ready(encoder); + if (IS_BROXTON(dev_priv)) { + /* + * Reset the DSI Device ready first for both ports + * and then port control registers for both ports + */ + for_each_dsi_port(port, intel_dsi->ports) + I915_WRITE(MIPI_DEVICE_READY(port), 0); + + for_each_dsi_port(port, intel_dsi->ports) + I915_WRITE(BXT_MIPI_PORT_CTRL(port), 0); + } else { + intel_dsi_clear_device_ready(encoder); + } if (IS_BROXTON(dev_priv)) { /* Power down DSI regulator to save power */ @@ -737,6 +756,8 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder, drm_panel_unprepare(intel_dsi->panel); + /* Disable Panel */ + drm_panel_power_off(intel_dsi->panel); msleep(intel_dsi->panel_off_delay); /* Panel Disable over CRC PMIC */