From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4FCBFC433F5 for ; Tue, 23 Nov 2021 08:55:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AE5E36E591; Tue, 23 Nov 2021 08:55:47 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id D36FA6E877 for ; Tue, 23 Nov 2021 08:55:46 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10176"; a="234932094" X-IronPort-AV: E=Sophos;i="5.87,257,1631602800"; d="scan'208";a="234932094" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2021 00:55:45 -0800 X-IronPort-AV: E=Sophos;i="5.87,257,1631602800"; d="scan'208";a="456985311" Received: from unknown (HELO intel.com) ([10.237.72.167]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2021 00:55:44 -0800 Date: Tue, 23 Nov 2021 10:55:30 +0200 From: "Lisovskiy, Stanislav" To: Mika Kahola Message-ID: <20211123085530.GD17614@intel.com> References: <20211119131348.725220-1-mika.kahola@intel.com> <20211119131348.725220-5-mika.kahola@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20211119131348.725220-5-mika.kahola@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Intel-gfx] [PATCH v2 4/5] drm/i915/display/dg2: Read CD clock from squasher table X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Nov 19, 2021 at 03:13:47PM +0200, Mika Kahola wrote: > To calculate CD clock with squasher unit, we set CD clock ratio to fixed value of 34. > The CD clock value is read from CD clock squasher table. > > BSpec: 54034 > > v2: Read ratio from register (Ville) > Drop unnecessary local variable (Ville) > Get CD clock from the given table > v3: Calculate CD clock frequency based on waveform bit pattern (Ville) > [v4: vsyrjala: Actually do a proper blind readout from the hardware] > [v5: vsyrjala: Use has_cdclk_squasher()] > Reviewed-by: Stanislav Lisovskiy > Signed-off-by: Mika Kahola > Signed-off-by: Ville Syrjälä > --- > drivers/gpu/drm/i915/display/intel_cdclk.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c > index 560383e8c5b6..5fcb393079f7 100644 > --- a/drivers/gpu/drm/i915/display/intel_cdclk.c > +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c > @@ -1466,6 +1466,7 @@ static void bxt_de_pll_readout(struct drm_i915_private *dev_priv, > static void bxt_get_cdclk(struct drm_i915_private *dev_priv, > struct intel_cdclk_config *cdclk_config) > { > + u32 squash_ctl = 0; > u32 divider; > int div; > > @@ -1503,7 +1504,21 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv, > return; > } > > - cdclk_config->cdclk = DIV_ROUND_CLOSEST(cdclk_config->vco, div); > + if (has_cdclk_squasher(dev_priv)) > + squash_ctl = intel_de_read(dev_priv, CDCLK_SQUASH_CTL); > + > + if (squash_ctl & CDCLK_SQUASH_ENABLE) { > + u16 waveform; > + int size; > + > + size = REG_FIELD_GET(CDCLK_SQUASH_WINDOW_SIZE_MASK, squash_ctl) + 1; > + waveform = REG_FIELD_GET(CDCLK_SQUASH_WAVEFORM_MASK, squash_ctl) >> (16 - size); > + > + cdclk_config->cdclk = DIV_ROUND_CLOSEST(hweight16(waveform) * > + cdclk_config->vco, size * div); > + } else { > + cdclk_config->cdclk = DIV_ROUND_CLOSEST(cdclk_config->vco, div); > + } > > out: > /* > -- > 2.27.0 >