From patchwork Mon Jan 9 09:15:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Srinivas, Vidya" X-Patchwork-Id: 9504209 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 4A26C60710 for ; Mon, 9 Jan 2017 09:08:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EB642840E for ; Mon, 9 Jan 2017 09:08:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33AD728461; Mon, 9 Jan 2017 09:08:14 +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 ED98D2840E for ; Mon, 9 Jan 2017 09:08:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 95E766E1A6; Mon, 9 Jan 2017 09:08:11 +0000 (UTC) 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 ESMTPS id 8C7936E1A1 for ; Mon, 9 Jan 2017 09:08:08 +0000 (UTC) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP; 09 Jan 2017 01:08:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,339,1477983600"; d="scan'208";a="920410047" Received: from vsrini4-ubuntu-intel.iind.intel.com ([10.223.26.91]) by orsmga003.jf.intel.com with ESMTP; 09 Jan 2017 01:08:07 -0800 From: Vidya Srinivas To: intel-gfx@lists.freedesktop.org Date: Mon, 9 Jan 2017 14:45:40 +0530 Message-Id: <1483953340-26206-1-git-send-email-vidya.srinivas@intel.com> X-Mailer: git-send-email 1.9.1 Subject: [Intel-gfx] [PATCH 02/14] drm/i915: Handle DSI case for DDI PLL 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 In case of DSI, DDI PLL is not required. Handle the same as part of DDI PLL handling. Signed-off-by: Uma Shankar --- drivers/gpu/drm/i915/intel_ddi.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) mode change 100644 => 100755 drivers/gpu/drm/i915/intel_ddi.c diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c old mode 100644 new mode 100755 index 66b367d..16137ef --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1102,13 +1102,13 @@ void intel_ddi_clock_get(struct intel_encoder *encoder, { struct intel_shared_dpll *pll; - pll = intel_get_shared_dpll(intel_crtc, crtc_state, - intel_encoder); - if (!pll) + pll = intel_get_shared_dpll(intel_crtc, crtc_state, intel_encoder); + if (pll == NULL) { DRM_DEBUG_DRIVER("failed to find PLL for pipe %c\n", pipe_name(intel_crtc->pipe)); - - return pll; + return false; + } + return true; } static bool @@ -1124,7 +1124,6 @@ void intel_ddi_clock_get(struct intel_encoder *encoder, pipe_name(intel_crtc->pipe)); return false; } - return true; } @@ -1133,7 +1132,15 @@ void intel_ddi_clock_get(struct intel_encoder *encoder, struct intel_crtc_state *crtc_state, struct intel_encoder *intel_encoder) { - return !!intel_get_shared_dpll(intel_crtc, crtc_state, intel_encoder); + struct intel_shared_dpll *pll; + + pll = intel_get_shared_dpll(intel_crtc, crtc_state, intel_encoder); + if (pll == NULL) { + DRM_DEBUG_DRIVER("failed to find PLL for pipe %c\n", + pipe_name(intel_crtc->pipe)); + return false; + } + return true; } /* @@ -1150,6 +1157,9 @@ bool intel_ddi_pll_select(struct intel_crtc *intel_crtc, struct intel_encoder *intel_encoder = intel_ddi_get_crtc_new_encoder(crtc_state); + if (intel_encoder->type == INTEL_OUTPUT_DSI) + return true; + if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) return skl_ddi_pll_select(intel_crtc, crtc_state, intel_encoder);