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

Commit f606bc6d authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Move intel_ddi_get_crtc_new_encoder() out from ddi code 



The ddi code no longer uses intel_ddi_get_crtc_new_encoder(). Move it
elsewhere where we have some users left.

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180518152931.13104-1-ville.syrjala@linux.intel.com
parent a33b1dc8

drivers/gpu/drm/i915/intel_ddi.c

+0 −29
Original line number Diff line number Diff line
@@ -1243,35 +1243,6 @@ intel_ddi_get_crtc_encoder(struct intel_crtc *crtc) 
	return ret;

}



/* Finds the only possible encoder associated with the given CRTC. */

struct intel_encoder *

intel_ddi_get_crtc_new_encoder(struct intel_crtc_state *crtc_state)

{

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	struct intel_encoder *ret = NULL;

	struct drm_atomic_state *state;

	struct drm_connector *connector;

	struct drm_connector_state *connector_state;

	int num_encoders = 0;

	int i;



	state = crtc_state->base.state;



	for_each_new_connector_in_state(state, connector, connector_state, i) {

		if (connector_state->crtc != crtc_state->base.crtc)

			continue;



		ret = to_intel_encoder(connector_state->best_encoder);

		num_encoders++;

	}



	WARN(num_encoders != 1, "%d encoders on crtc for pipe %c\n", num_encoders,

	     pipe_name(crtc->pipe));



	BUG_ON(ret == NULL);

	return ret;

}



#define LC_FREQ 2700



static int hsw_ddi_calc_wrpll_link(struct drm_i915_private *dev_priv,

drivers/gpu/drm/i915/intel_display.c

+30 −1
Original line number Diff line number Diff line
@@ -4590,6 +4590,35 @@ static void ivybridge_update_fdi_bc_bifurcation(struct intel_crtc *intel_crtc) 
	}

}



/*

 * Finds the encoder associated with the given CRTC. This can only be

 * used when we know that the CRTC isn't feeding multiple encoders!

 */

static struct intel_encoder *

intel_get_crtc_new_encoder(const struct intel_crtc_state *crtc_state)

{

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	const struct drm_atomic_state *state = crtc_state->base.state;

	const struct drm_connector_state *connector_state;

	const struct drm_connector *connector;

	struct intel_encoder *encoder = NULL;

	int num_encoders = 0;

	int i;



	for_each_new_connector_in_state(state, connector, connector_state, i) {

		if (connector_state->crtc != &crtc->base)

			continue;



		encoder = to_intel_encoder(connector_state->best_encoder);

		num_encoders++;

	}



	WARN(num_encoders != 1, "%d encoders for pipe %c\n",

	     num_encoders, pipe_name(crtc->pipe));



	return encoder;

}



/* Return which DP Port should be selected for Transcoder DP control */

static enum port

intel_trans_dp_port_sel(struct intel_crtc *crtc)
@@ -9103,7 +9132,7 @@ static int haswell_crtc_compute_clock(struct intel_crtc *crtc, 
{

	if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) {

		struct intel_encoder *encoder =

			intel_ddi_get_crtc_new_encoder(crtc_state);

			intel_get_crtc_new_encoder(crtc_state);



		if (!intel_get_shared_dpll(crtc, crtc_state, encoder)) {

			DRM_DEBUG_DRIVER("failed to find PLL for pipe %c\n",

drivers/gpu/drm/i915/intel_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -1393,8 +1393,6 @@ void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv, 
				       enum transcoder cpu_transcoder);

void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state);

void intel_ddi_disable_pipe_clock(const  struct intel_crtc_state *crtc_state);

struct intel_encoder *

intel_ddi_get_crtc_new_encoder(struct intel_crtc_state *crtc_state);

void intel_ddi_set_pipe_settings(const struct intel_crtc_state *crtc_state);

void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp);

bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);