Commit 63aef47b authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/fdi: move intel_fdi_link_freq() to intel_fdi.[ch] 



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.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8c9bb23d92878deb1ecc75427ec6648bd3505816.1629281426.git.jani.nikula@intel.com
parent 3c6a4a02

drivers/gpu/drm/i915/display/intel_display_types.h

+0 −9
Original line number Diff line number Diff line
@@ -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 ||

drivers/gpu/drm/i915/display/intel_fdi.c

+9 −0
Original line number Diff line number Diff line
@@ -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,

			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)

{

drivers/gpu/drm/i915/display/intel_fdi.h

+4 −0
Original line number Diff line number Diff line
@@ -6,12 +6,16 @@ 
#ifndef _INTEL_FDI_H_

#define _INTEL_FDI_H_



#include <linux/types.h>



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);