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 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 70612C4320E for ; Thu, 19 Aug 2021 16:25:11 +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 EBF8161100 for ; Thu, 19 Aug 2021 16:25:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EBF8161100 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 57E8E6E9A6; Thu, 19 Aug 2021 16:25:07 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id A4DB86E9A6 for ; Thu, 19 Aug 2021 16:25:05 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10081"; a="280329209" X-IronPort-AV: E=Sophos;i="5.84,335,1620716400"; d="scan'208";a="280329209" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2021 09:25:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,335,1620716400"; d="scan'208";a="532574157" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by fmsmga002.fm.intel.com with SMTP; 19 Aug 2021 09:25:00 -0700 Received: by stinkbox (sSMTP sendmail emulation); Thu, 19 Aug 2021 19:25:00 +0300 Date: Thu, 19 Aug 2021 19:25:00 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org Message-ID: References: <8c9bb23d92878deb1ecc75427ec6648bd3505816.1629281426.git.jani.nikula@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <8c9bb23d92878deb1ecc75427ec6648bd3505816.1629281426.git.jani.nikula@intel.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH 5/5] drm/i915/fdi: move intel_fdi_link_freq() to intel_fdi.[ch] 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 18, 2021 at 01:11:09PM +0300, Jani Nikula wrote: > There's no performance reason to have it as static inline; move it out > of intel_display_types.h to reduce clutter and dependency on i915_drv.h. > > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_display_types.h | 9 --------- > drivers/gpu/drm/i915/display/intel_fdi.c | 9 +++++++++ > drivers/gpu/drm/i915/display/intel_fdi.h | 4 ++++ > 3 files changed, 13 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index 7b5d7b1ae501..c2725d07b930 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -2040,15 +2040,6 @@ static inline u32 i9xx_dpll_compute_fp(struct dpll *dpll) > return dpll->n << 16 | dpll->m1 << 8 | dpll->m2; > } > > -static inline u32 intel_fdi_link_freq(struct drm_i915_private *dev_priv, > - const struct intel_crtc_state *pipe_config) > -{ > - if (HAS_DDI(dev_priv)) > - return pipe_config->port_clock; /* SPLL */ > - else > - return dev_priv->fdi_pll_freq; > -} > - > static inline bool is_ccs_modifier(u64 modifier) > { > return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS || > diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c b/drivers/gpu/drm/i915/display/intel_fdi.c > index e10b9cd8e86e..970a57369b05 100644 > --- a/drivers/gpu/drm/i915/display/intel_fdi.c > +++ b/drivers/gpu/drm/i915/display/intel_fdi.c > @@ -95,6 +95,15 @@ static int ilk_check_fdi_lanes(struct drm_device *dev, enum pipe pipe, > } > } > > +u32 intel_fdi_link_freq(struct drm_i915_private *i915, Could just change it to 'int' while at it. Series is Reviewed-by: Ville Syrjälä > + const struct intel_crtc_state *pipe_config) > +{ > + if (HAS_DDI(i915)) > + return pipe_config->port_clock; /* SPLL */ > + else > + return i915->fdi_pll_freq; > +} > + > int ilk_fdi_compute_config(struct intel_crtc *crtc, > 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 af01d2c173a8..fd63a6a53fca 100644 > --- a/drivers/gpu/drm/i915/display/intel_fdi.h > +++ b/drivers/gpu/drm/i915/display/intel_fdi.h > @@ -6,12 +6,16 @@ > #ifndef _INTEL_FDI_H_ > #define _INTEL_FDI_H_ > > +#include > + > struct drm_i915_private; > struct intel_crtc; > struct intel_crtc_state; > struct intel_encoder; > > #define I915_DISPLAY_CONFIG_RETRY 1 > +u32 intel_fdi_link_freq(struct drm_i915_private *i915, > + const struct intel_crtc_state *pipe_config); > int ilk_fdi_compute_config(struct intel_crtc *intel_crtc, > struct intel_crtc_state *pipe_config); > void intel_fdi_normal_train(struct intel_crtc *crtc); > -- > 2.20.1 -- Ville Syrjälä Intel