drm/i915: Kill intel_prepare_ddi() (6a7e4f99) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/i915/i915_drv.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1077,7 +1077,6 @@ static int bxt_resume_prepare(struct drm_i915_private *dev_priv)
	*/		*/
	broxton_init_cdclk(dev);		broxton_init_cdclk(dev);
	broxton_ddi_phy_init(dev);		broxton_ddi_phy_init(dev);
	intel_prepare_ddi(dev);

	return 0;		return 0;
	}		}

drivers/gpu/drm/i915/intel_ddi.c

+28 −71

Original line number	Original line	Diff line number	Diff line
	@@ -342,12 +342,6 @@ enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder)
	return port;		return port;
	}		}

	static bool
	intel_dig_port_supports_hdmi(const struct intel_digital_port *intel_dig_port)
	{
	return i915_mmio_reg_valid(intel_dig_port->hdmi.hdmi_reg);
	}

	static const struct ddi_buf_trans *		static const struct ddi_buf_trans *
	skl_get_buf_trans_dp(struct drm_i915_private dev_priv, int n_entries)		skl_get_buf_trans_dp(struct drm_i915_private dev_priv, int n_entries)
	{		{
	@@ -401,28 +395,34 @@ skl_get_buf_trans_hdmi(struct drm_i915_private dev_priv, int n_entries)
	* in either FDI or DP modes only, as HDMI connections will work with both		* in either FDI or DP modes only, as HDMI connections will work with both
	* of those		* of those
	*/		*/
	static void intel_prepare_ddi_buffers(struct drm_i915_private *dev_priv,		void intel_prepare_ddi_buffer(struct intel_encoder *encoder)
	enum port port, bool supports_hdmi)
	{		{
			struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
	u32 iboost_bit = 0;		u32 iboost_bit = 0;
	int i, n_hdmi_entries, n_dp_entries, n_edp_entries, hdmi_default_entry,		int i, n_hdmi_entries, n_dp_entries, n_edp_entries, hdmi_default_entry,
	size;		size;
	int hdmi_level = dev_priv->vbt.ddi_port_info[port].hdmi_level_shift;		int hdmi_level;
			enum port port;
	const struct ddi_buf_trans *ddi_translations_fdi;		const struct ddi_buf_trans *ddi_translations_fdi;
	const struct ddi_buf_trans *ddi_translations_dp;		const struct ddi_buf_trans *ddi_translations_dp;
	const struct ddi_buf_trans *ddi_translations_edp;		const struct ddi_buf_trans *ddi_translations_edp;
	const struct ddi_buf_trans *ddi_translations_hdmi;		const struct ddi_buf_trans *ddi_translations_hdmi;
	const struct ddi_buf_trans *ddi_translations;		const struct ddi_buf_trans *ddi_translations;

			port = intel_ddi_get_encoder_port(encoder);
			hdmi_level = dev_priv->vbt.ddi_port_info[port].hdmi_level_shift;

	if (IS_BROXTON(dev_priv)) {		if (IS_BROXTON(dev_priv)) {
	if (!supports_hdmi)		if (encoder->type != INTEL_OUTPUT_HDMI)
	return;		return;

	/* Vswing programming for HDMI */		/* Vswing programming for HDMI */
	bxt_ddi_vswing_sequence(dev_priv, hdmi_level, port,		bxt_ddi_vswing_sequence(dev_priv, hdmi_level, port,
	INTEL_OUTPUT_HDMI);		INTEL_OUTPUT_HDMI);
	return;		return;
	} else if (IS_SKYLAKE(dev_priv) \|\| IS_KABYLAKE(dev_priv)) {		}

			if (IS_SKYLAKE(dev_priv) \|\| IS_KABYLAKE(dev_priv)) {
	ddi_translations_fdi = NULL;		ddi_translations_fdi = NULL;
	ddi_translations_dp =		ddi_translations_dp =
	skl_get_buf_trans_dp(dev_priv, &n_dp_entries);		skl_get_buf_trans_dp(dev_priv, &n_dp_entries);
	@@ -468,30 +468,18 @@ static void intel_prepare_ddi_buffers(struct drm_i915_private *dev_priv,
	hdmi_default_entry = 7;		hdmi_default_entry = 7;
	}		}

	switch (port) {		switch (encoder->type) {
	case PORT_A:		case INTEL_OUTPUT_EDP:
	ddi_translations = ddi_translations_edp;		ddi_translations = ddi_translations_edp;
	size = n_edp_entries;		size = n_edp_entries;
	break;		break;
	case PORT_B:		case INTEL_OUTPUT_DISPLAYPORT:
	case PORT_C:		case INTEL_OUTPUT_HDMI:
	ddi_translations = ddi_translations_dp;
	size = n_dp_entries;
	break;
	case PORT_D:
	if (intel_dp_is_edp(dev_priv->dev, PORT_D)) {
	ddi_translations = ddi_translations_edp;
	size = n_edp_entries;
	} else {
	ddi_translations = ddi_translations_dp;		ddi_translations = ddi_translations_dp;
	size = n_dp_entries;		size = n_dp_entries;
	}
	break;		break;
	case PORT_E:		case INTEL_OUTPUT_ANALOG:
	if (ddi_translations_fdi)
	ddi_translations = ddi_translations_fdi;		ddi_translations = ddi_translations_fdi;
	else
	ddi_translations = ddi_translations_dp;
	size = n_dp_entries;		size = n_dp_entries;
	break;		break;
	default:		default:
	@@ -505,7 +493,7 @@ static void intel_prepare_ddi_buffers(struct drm_i915_private *dev_priv,
	ddi_translations[i].trans2);		ddi_translations[i].trans2);
	}		}

	if (!supports_hdmi)		if (encoder->type != INTEL_OUTPUT_HDMI)
	return;		return;

	/* Choose a good default if VBT is badly populated */		/* Choose a good default if VBT is badly populated */
	@@ -520,37 +508,6 @@ static void intel_prepare_ddi_buffers(struct drm_i915_private *dev_priv,
	ddi_translations_hdmi[hdmi_level].trans2);		ddi_translations_hdmi[hdmi_level].trans2);
	}		}

	/* Program DDI buffers translations for DP. By default, program ports A-D in DP
	* mode and port E for FDI.
	*/
	void intel_prepare_ddi(struct drm_device *dev)
	{
	struct intel_encoder *intel_encoder;
	bool visited[I915_MAX_PORTS] = { 0, };

	if (!HAS_DDI(dev))
	return;

	for_each_intel_encoder(dev, intel_encoder) {
	struct intel_digital_port *intel_dig_port;
	enum port port;
	bool supports_hdmi;

	if (intel_encoder->type == INTEL_OUTPUT_DSI)
	continue;

	ddi_get_encoder_port(intel_encoder, &intel_dig_port, &port);
	if (visited[port])
	continue;

	supports_hdmi = intel_dig_port &&
	intel_dig_port_supports_hdmi(intel_dig_port);

	intel_prepare_ddi_buffers(to_i915(dev), port, supports_hdmi);
	visited[port] = true;
	}
	}

	static void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv,		static void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv,
	enum port port)		enum port port)
	{		{
	@@ -579,8 +536,14 @@ void hsw_fdi_link_train(struct drm_crtc *crtc)
	struct drm_device *dev = crtc->dev;		struct drm_device *dev = crtc->dev;
	struct drm_i915_private *dev_priv = dev->dev_private;		struct drm_i915_private *dev_priv = dev->dev_private;
	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);		struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
			struct intel_encoder *encoder;
	u32 temp, i, rx_ctl_val;		u32 temp, i, rx_ctl_val;

			for_each_encoder_on_crtc(dev, crtc, encoder) {
			WARN_ON(encoder->type != INTEL_OUTPUT_ANALOG);
			intel_prepare_ddi_buffer(encoder);
			}

	/* Set the FDI_RX_MISC pwrdn lanes and the 2 workarounds listed at the		/* Set the FDI_RX_MISC pwrdn lanes and the 2 workarounds listed at the
	* mode set "sequence for CRT port" document:		* mode set "sequence for CRT port" document:
	* - TP1 to TP2 time with the default value		* - TP1 to TP2 time with the default value
	@@ -2306,12 +2269,12 @@ void intel_ddi_clk_select(struct intel_encoder *encoder,
	static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)		static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)
	{		{
	struct drm_encoder *encoder = &intel_encoder->base;		struct drm_encoder *encoder = &intel_encoder->base;
	struct drm_device *dev = encoder->dev;		struct drm_i915_private *dev_priv = to_i915(encoder->dev);
	struct drm_i915_private *dev_priv = dev->dev_private;
	struct intel_crtc *crtc = to_intel_crtc(encoder->crtc);		struct intel_crtc *crtc = to_intel_crtc(encoder->crtc);
	enum port port = intel_ddi_get_encoder_port(intel_encoder);		enum port port = intel_ddi_get_encoder_port(intel_encoder);
	int type = intel_encoder->type;		int type = intel_encoder->type;
	int hdmi_level;
			intel_prepare_ddi_buffer(intel_encoder);

	if (type == INTEL_OUTPUT_EDP) {		if (type == INTEL_OUTPUT_EDP) {
	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
	@@ -2329,17 +2292,11 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)

	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
	intel_dp_start_link_train(intel_dp);		intel_dp_start_link_train(intel_dp);
	if (port != PORT_A \|\| INTEL_INFO(dev)->gen >= 9)		if (port != PORT_A \|\| INTEL_INFO(dev_priv)->gen >= 9)
	intel_dp_stop_link_train(intel_dp);		intel_dp_stop_link_train(intel_dp);
	} else if (type == INTEL_OUTPUT_HDMI) {		} else if (type == INTEL_OUTPUT_HDMI) {
	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);		struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);

	if (IS_BROXTON(dev)) {
	hdmi_level = dev_priv->vbt.
	ddi_port_info[port].hdmi_level_shift;
	bxt_ddi_vswing_sequence(dev_priv, hdmi_level, port,
	INTEL_OUTPUT_HDMI);
	}
	intel_hdmi->set_infoframes(encoder,		intel_hdmi->set_infoframes(encoder,
	crtc->config->has_hdmi_sink,		crtc->config->has_hdmi_sink,
	&crtc->config->base.adjusted_mode);		&crtc->config->base.adjusted_mode);

drivers/gpu/drm/i915/intel_display.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -9710,8 +9710,6 @@ void hsw_disable_pc8(struct drm_i915_private *dev_priv)
	val \|= PCH_LP_PARTITION_LEVEL_DISABLE;		val \|= PCH_LP_PARTITION_LEVEL_DISABLE;
	I915_WRITE(SOUTH_DSPCLK_GATE_D, val);		I915_WRITE(SOUTH_DSPCLK_GATE_D, val);
	}		}

	intel_prepare_ddi(dev);
	}		}

	static void broxton_modeset_commit_cdclk(struct drm_atomic_state *old_state)		static void broxton_modeset_commit_cdclk(struct drm_atomic_state *old_state)
	@@ -15312,7 +15310,6 @@ void intel_modeset_init_hw(struct drm_device *dev)

	dev_priv->atomic_cdclk_freq = dev_priv->cdclk_freq;		dev_priv->atomic_cdclk_freq = dev_priv->cdclk_freq;

	intel_prepare_ddi(dev);
	intel_init_clock_gating(dev);		intel_init_clock_gating(dev);
	intel_enable_gt_powersave(dev);		intel_enable_gt_powersave(dev);
	}		}

drivers/gpu/drm/i915/intel_dp_mst.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -184,6 +184,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder)
	intel_mst->port = found->port;		intel_mst->port = found->port;

	if (intel_dp->active_mst_links == 0) {		if (intel_dp->active_mst_links == 0) {
			intel_prepare_ddi_buffer(&intel_dig_port->base);

	intel_ddi_clk_select(&intel_dig_port->base, intel_crtc->config);		intel_ddi_clk_select(&intel_dig_port->base, intel_crtc->config);

	intel_dp_set_link_params(intel_dp, intel_crtc->config);		intel_dp_set_link_params(intel_dp, intel_crtc->config);

drivers/gpu/drm/i915/intel_drv.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1025,7 +1025,7 @@ void intel_crt_init(struct drm_device *dev);
	/* intel_ddi.c */		/* intel_ddi.c */
	void intel_ddi_clk_select(struct intel_encoder *encoder,		void intel_ddi_clk_select(struct intel_encoder *encoder,
	const struct intel_crtc_state *pipe_config);		const struct intel_crtc_state *pipe_config);
	void intel_prepare_ddi(struct drm_device *dev);		void intel_prepare_ddi_buffer(struct intel_encoder *encoder);
	void hsw_fdi_link_train(struct drm_crtc *crtc);		void hsw_fdi_link_train(struct drm_crtc *crtc);
	void intel_ddi_init(struct drm_device *dev, enum port port);		void intel_ddi_init(struct drm_device *dev, enum port port);
	enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder);		enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder);