From patchwork Thu Apr 30 15:39:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 6305271 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 831A0BEEE1 for ; Thu, 30 Apr 2015 15:39:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA4D2201F5 for ; Thu, 30 Apr 2015 15:39:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D156C20155 for ; Thu, 30 Apr 2015 15:39:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 332976E853; Thu, 30 Apr 2015 08:39:36 -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 50D226E853 for ; Thu, 30 Apr 2015 08:39:32 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP; 30 Apr 2015 08:39:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,677,1422950400"; d="scan'208";a="718514136" Received: from dpotapov-mobl1.ger.corp.intel.com (HELO strange.ger.corp.intel.com) ([10.252.27.120]) by fmsmga002.fm.intel.com with ESMTP; 30 Apr 2015 08:39:30 -0700 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Thu, 30 Apr 2015 16:39:22 +0100 Message-Id: <1430408363-20905-8-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430408363-20905-1-git-send-email-damien.lespiau@intel.com> References: <1430408363-20905-1-git-send-email-damien.lespiau@intel.com> Subject: [Intel-gfx] [PATCH 7/8] drm/i915/skl: Change CDCLK behind PCU's back 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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: Damien Lespiau --- drivers/gpu/drm/i915/intel_display.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 9c8338f..2cbae9a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5525,6 +5525,7 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv, unsigned int freq) { int ret; u32 val, freq_select, freq_decimal, pcu_ack; + bool do_pcu_ack = true; DRM_DEBUG_DRIVER("Changing CDCLK to %dKHz\n", freq); @@ -5534,8 +5535,8 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv, unsigned int freq) ret = sandybridge_pcode_read(dev_priv, SKL_PCODE_CDCLK_CONTROL, &val); mutex_unlock(&dev_priv->rps.hw_lock); if (ret || !(val & SKL_CDCLK_READY_FOR_CHANGE)) { - DRM_ERROR("failed to inform PCU about cdclk change\n"); - return; + DRM_DEBUG_KMS("failed to inform PCU about cdclk change\n"); + do_pcu_ack = false; } /* set CDCLK_CTL */ @@ -5567,6 +5568,9 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv, unsigned int freq) I915_WRITE(CDCLK_CTL, freq_select | freq_decimal); POSTING_READ(CDCLK_CTL); + if (!do_pcu_ack) + return; + /* inform PCU of the change */ mutex_lock(&dev_priv->rps.hw_lock); sandybridge_pcode_write(dev_priv, SKL_PCODE_CDCLK_CONTROL, pcu_ack);