Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b551842d authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: make set_m_n functions static 



This is possible thanks to moving the m/n stuff into pipe_config.

Unfortunately we need to move them a bit to avoid forward
declarations.

Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 275f01b2

drivers/gpu/drm/i915/intel_display.c

+34 −34
Original line number Original line Diff line number Diff line
@@ -4382,6 +4382,40 @@ static void vlv_pllb_recal_opamp(struct drm_i915_private *dev_priv) 
	intel_dpio_write(dev_priv, DPIO_CALIBRATION, reg_val);

	intel_dpio_write(dev_priv, DPIO_CALIBRATION, reg_val);

}

}





static void intel_pch_transcoder_set_m_n(struct intel_crtc *crtc,

					 struct intel_link_m_n *m_n)

{

	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	int pipe = crtc->pipe;



	I915_WRITE(TRANSDATA_M1(pipe), TU_SIZE(m_n->tu) | m_n->gmch_m);

	I915_WRITE(TRANSDATA_N1(pipe), m_n->gmch_n);

	I915_WRITE(TRANSDPLINK_M1(pipe), m_n->link_m);

	I915_WRITE(TRANSDPLINK_N1(pipe), m_n->link_n);

}



static void intel_cpu_transcoder_set_m_n(struct intel_crtc *crtc,

					 struct intel_link_m_n *m_n)

{

	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	int pipe = crtc->pipe;

	enum transcoder transcoder = crtc->config.cpu_transcoder;



	if (INTEL_INFO(dev)->gen >= 5) {

		I915_WRITE(PIPE_DATA_M1(transcoder), TU_SIZE(m_n->tu) | m_n->gmch_m);

		I915_WRITE(PIPE_DATA_N1(transcoder), m_n->gmch_n);

		I915_WRITE(PIPE_LINK_M1(transcoder), m_n->link_m);

		I915_WRITE(PIPE_LINK_N1(transcoder), m_n->link_n);

	} else {

		I915_WRITE(PIPE_GMCH_DATA_M(pipe), TU_SIZE(m_n->tu) | m_n->gmch_m);

		I915_WRITE(PIPE_GMCH_DATA_N(pipe), m_n->gmch_n);

		I915_WRITE(PIPE_DP_LINK_M(pipe), m_n->link_m);

		I915_WRITE(PIPE_DP_LINK_N(pipe), m_n->link_n);

	}

}



static void intel_dp_set_m_n(struct intel_crtc *crtc)

static void intel_dp_set_m_n(struct intel_crtc *crtc)

{

{

	if (crtc->config.has_pch_encoder)

	if (crtc->config.has_pch_encoder)
@@ -5606,40 +5640,6 @@ int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp) 
	return bps / (link_bw * 8) + 1;

	return bps / (link_bw * 8) + 1;

}

}





void intel_pch_transcoder_set_m_n(struct intel_crtc *crtc,

				  struct intel_link_m_n *m_n)

{

	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	int pipe = crtc->pipe;



	I915_WRITE(TRANSDATA_M1(pipe), TU_SIZE(m_n->tu) | m_n->gmch_m);

	I915_WRITE(TRANSDATA_N1(pipe), m_n->gmch_n);

	I915_WRITE(TRANSDPLINK_M1(pipe), m_n->link_m);

	I915_WRITE(TRANSDPLINK_N1(pipe), m_n->link_n);

}



void intel_cpu_transcoder_set_m_n(struct intel_crtc *crtc,

				  struct intel_link_m_n *m_n)

{

	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	int pipe = crtc->pipe;

	enum transcoder transcoder = crtc->config.cpu_transcoder;



	if (INTEL_INFO(dev)->gen >= 5) {

		I915_WRITE(PIPE_DATA_M1(transcoder), TU_SIZE(m_n->tu) | m_n->gmch_m);

		I915_WRITE(PIPE_DATA_N1(transcoder), m_n->gmch_n);

		I915_WRITE(PIPE_LINK_M1(transcoder), m_n->link_m);

		I915_WRITE(PIPE_LINK_N1(transcoder), m_n->link_n);

	} else {

		I915_WRITE(PIPE_GMCH_DATA_M(pipe), TU_SIZE(m_n->tu) | m_n->gmch_m);

		I915_WRITE(PIPE_GMCH_DATA_N(pipe), m_n->gmch_n);

		I915_WRITE(PIPE_DP_LINK_M(pipe), m_n->link_m);

		I915_WRITE(PIPE_DP_LINK_N(pipe), m_n->link_n);

	}

}



static bool ironlake_needs_fb_cb_tune(struct dpll *dpll, int factor)

static bool ironlake_needs_fb_cb_tune(struct dpll *dpll, int factor)

{

{

	return i9xx_dpll_compute_m(dpll) < factor * dpll->n;

	return i9xx_dpll_compute_m(dpll) < factor * dpll->n;

drivers/gpu/drm/i915/intel_drv.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -719,10 +719,6 @@ extern void intel_init_clock_gating(struct drm_device *dev); 
extern void intel_write_eld(struct drm_encoder *encoder,

extern void intel_write_eld(struct drm_encoder *encoder,

			    struct drm_display_mode *mode);

			    struct drm_display_mode *mode);

extern void intel_cpt_verify_modeset(struct drm_device *dev, int pipe);

extern void intel_cpt_verify_modeset(struct drm_device *dev, int pipe);

extern void intel_cpu_transcoder_set_m_n(struct intel_crtc *crtc,

					 struct intel_link_m_n *m_n);

extern void intel_pch_transcoder_set_m_n(struct intel_crtc *crtc,

					 struct intel_link_m_n *m_n);

extern void intel_prepare_ddi(struct drm_device *dev);

extern void intel_prepare_ddi(struct drm_device *dev);

extern void hsw_fdi_link_train(struct drm_crtc *crtc);

extern void hsw_fdi_link_train(struct drm_crtc *crtc);

extern void intel_ddi_init(struct drm_device *dev, enum port port);

extern void intel_ddi_init(struct drm_device *dev, enum port port);