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 X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1915DC432BE for ; Thu, 26 Aug 2021 19:36:46 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id AA11C60FF2 for ; Thu, 26 Aug 2021 19:36:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AA11C60FF2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F7556E8A2; Thu, 26 Aug 2021 19:36:45 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id C30F36E8A2 for ; Thu, 26 Aug 2021 19:36:43 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10088"; a="303402647" X-IronPort-AV: E=Sophos;i="5.84,354,1620716400"; d="scan'208";a="303402647" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Aug 2021 12:36:43 -0700 X-IronPort-AV: E=Sophos;i="5.84,354,1620716400"; d="scan'208";a="528020771" Received: from fbenmlih-mobile.amr.corp.intel.com (HELO intel.com) ([10.255.36.148]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Aug 2021 12:36:42 -0700 Date: Thu, 26 Aug 2021 15:36:41 -0400 From: Rodrigo Vivi To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Intel-gfx] [PATCH 1/5] drm/i915/fdi: move intel_update_fdi_pll_freq to intel_fdi.c 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, Aug 25, 2021 at 06:47:48PM +0300, Jani Nikula wrote: > Move FDI related functions to intel_fdi.c. Rename to have intel_fdi > prefix while at it. > > Signed-off-by: Jani Nikula Reviewed-by: Rodrigo Vivi > --- > drivers/gpu/drm/i915/display/intel_display.c | 18 +----------------- > drivers/gpu/drm/i915/display/intel_fdi.c | 16 ++++++++++++++++ > drivers/gpu/drm/i915/display/intel_fdi.h | 1 + > 3 files changed, 18 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index 794690c0dba5..3a9afe04ce0a 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -11564,22 +11564,6 @@ static void sanitize_watermarks(struct drm_i915_private *dev_priv) > drm_modeset_acquire_fini(&ctx); > } > > -static void intel_update_fdi_pll_freq(struct drm_i915_private *dev_priv) > -{ > - if (IS_IRONLAKE(dev_priv)) { > - u32 fdi_pll_clk = > - intel_de_read(dev_priv, FDI_PLL_BIOS_0) & FDI_PLL_FB_CLOCK_MASK; > - > - dev_priv->fdi_pll_freq = (fdi_pll_clk + 2) * 10000; > - } else if (IS_SANDYBRIDGE(dev_priv) || IS_IVYBRIDGE(dev_priv)) { > - dev_priv->fdi_pll_freq = 270000; > - } else { > - return; > - } > - > - drm_dbg(&dev_priv->drm, "FDI PLL freq=%d\n", dev_priv->fdi_pll_freq); > -} > - > static int intel_initial_commit(struct drm_device *dev) > { > struct drm_atomic_state *state = NULL; > @@ -11833,7 +11817,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915) > > intel_plane_possible_crtcs_init(i915); > intel_shared_dpll_init(dev); > - intel_update_fdi_pll_freq(i915); > + intel_fdi_pll_freq_update(i915); > > intel_update_czclk(i915); > intel_modeset_init_hw(i915); > diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c b/drivers/gpu/drm/i915/display/intel_fdi.c > index 13f8ba4c9188..88a78dafd54d 100644 > --- a/drivers/gpu/drm/i915/display/intel_fdi.c > +++ b/drivers/gpu/drm/i915/display/intel_fdi.c > @@ -95,6 +95,22 @@ static int ilk_check_fdi_lanes(struct drm_device *dev, enum pipe pipe, > } > } > > +void intel_fdi_pll_freq_update(struct drm_i915_private *i915) > +{ > + if (IS_IRONLAKE(i915)) { > + u32 fdi_pll_clk = > + intel_de_read(i915, FDI_PLL_BIOS_0) & FDI_PLL_FB_CLOCK_MASK; > + > + i915->fdi_pll_freq = (fdi_pll_clk + 2) * 10000; > + } else if (IS_SANDYBRIDGE(i915) || IS_IVYBRIDGE(i915)) { > + i915->fdi_pll_freq = 270000; > + } else { > + return; > + } > + > + drm_dbg(&i915->drm, "FDI PLL freq=%d\n", i915->fdi_pll_freq); > +} > + > int intel_fdi_link_freq(struct drm_i915_private *i915, > const struct intel_crtc_state *pipe_config) > { > diff --git a/drivers/gpu/drm/i915/display/intel_fdi.h b/drivers/gpu/drm/i915/display/intel_fdi.h > index 2c8ffd9ceaed..cda9a32c25ba 100644 > --- a/drivers/gpu/drm/i915/display/intel_fdi.h > +++ b/drivers/gpu/drm/i915/display/intel_fdi.h > @@ -23,5 +23,6 @@ void ilk_fdi_pll_enable(const struct intel_crtc_state *crtc_state); > void intel_fdi_init_hook(struct drm_i915_private *dev_priv); > void hsw_fdi_link_train(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state); > +void intel_fdi_pll_freq_update(struct drm_i915_private *i915); > > #endif > -- > 2.20.1 >