From patchwork Wed Sep 24 08:46:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav K Singh X-Patchwork-Id: 4962751 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B52AE9F32B for ; Wed, 24 Sep 2014 08:48:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8CECE20166 for ; Wed, 24 Sep 2014 08:48:16 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 550112015D for ; Wed, 24 Sep 2014 08:48:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7EA6D6E519; Wed, 24 Sep 2014 01:48:14 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id D1B456E519 for ; Wed, 24 Sep 2014 01:48:13 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 24 Sep 2014 01:41:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,587,1406617200"; d="scan'208";a="578097836" Received: from gksingh1.iind.intel.com ([10.223.26.84]) by orsmga001.jf.intel.com with ESMTP; 24 Sep 2014 01:48:11 -0700 From: Gaurav K Singh To: intel-gfx Date: Wed, 24 Sep 2014 14:16:55 +0530 Message-Id: <1411548418-26525-7-git-send-email-gaurav.k.singh@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1411548418-26525-1-git-send-email-gaurav.k.singh@intel.com> References: <1411548418-26525-1-git-send-email-gaurav.k.singh@intel.com> Cc: Shobhit Kumar Subject: [Intel-gfx] [PATCH 6/9] drm/i915: Dsipll clk to be enabled for DSI1 in case of dual link configuration X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Signed-off-by: Gaurav K Singh Signed-off-by: Shobhit Kumar --- drivers/gpu/drm/i915/intel_dsi_pll.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dsi_pll.c b/drivers/gpu/drm/i915/intel_dsi_pll.c index fa7a6ca..2464089 100644 --- a/drivers/gpu/drm/i915/intel_dsi_pll.c +++ b/drivers/gpu/drm/i915/intel_dsi_pll.c @@ -243,6 +243,9 @@ static void vlv_configure_dsi_pll(struct intel_encoder *encoder) dsi_mnp.dsi_pll_ctrl |= DSI_PLL_CLK_GATE_DSI0_DSIPLL; + if (intel_dsi->dual_link) + dsi_mnp.dsi_pll_ctrl |= DSI_PLL_CLK_GATE_DSI1_DSIPLL; + DRM_DEBUG_KMS("dsi pll div %08x, ctrl %08x\n", dsi_mnp.dsi_pll_div, dsi_mnp.dsi_pll_ctrl); @@ -271,12 +274,11 @@ void vlv_enable_dsi_pll(struct intel_encoder *encoder) mutex_unlock(&dev_priv->dpio_lock); - if (wait_for(I915_READ(PIPECONF(PIPE_A)) & PIPECONF_DSI_PLL_LOCKED, 20)) { - DRM_ERROR("DSI PLL lock failed\n"); - return; - } - - DRM_DEBUG_KMS("DSI PLL locked\n"); + tmp = vlv_cck_read(dev_priv, CCK_REG_DSI_PLL_CONTROL); + if (tmp & DSI_PLL_LOCK) + DRM_DEBUG_KMS("DSI PLL locked\n"); + else + DRM_DEBUG_KMS("DSI PLL lock failed\n"); } void vlv_disable_dsi_pll(struct intel_encoder *encoder)