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

Commit 15e6bf74 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: remove is_pch_edp() helpers and state variable 



There are no more users for these, so remove them.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 68b4d824

drivers/gpu/drm/i915/intel_dp.c

+0 −36
Original line number Diff line number Diff line
@@ -52,19 +52,6 @@ static bool is_edp(struct intel_dp *intel_dp) 
	return intel_dig_port->base.type == INTEL_OUTPUT_EDP;

}



/**

 * is_pch_edp - is the port on the PCH and attached to an eDP panel?

 * @intel_dp: DP struct

 *

 * Returns true if the given DP struct corresponds to a PCH DP port attached

 * to an eDP panel, false otherwise.  Helpful for determining whether we

 * may need FDI resources for a given DP output or not.

 */

static bool is_pch_edp(struct intel_dp *intel_dp)

{

	return intel_dp->is_pch_edp;

}



static struct drm_device *intel_dp_to_dev(struct intel_dp *intel_dp)

{

	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
@@ -93,25 +80,6 @@ static struct intel_dp *intel_attached_dp(struct drm_connector *connector) 
	return enc_to_intel_dp(&intel_attached_encoder(connector)->base);

}



/**

 * intel_encoder_is_pch_edp - is the given encoder a PCH attached eDP?

 * @encoder: DRM encoder

 *

 * Return true if @encoder corresponds to a PCH attached eDP panel.  Needed

 * by intel_display.c.

 */

bool intel_encoder_is_pch_edp(struct drm_encoder *encoder)

{

	struct intel_dp *intel_dp;



	if (!encoder)

		return false;



	intel_dp = enc_to_intel_dp(encoder);



	return is_pch_edp(intel_dp);

}



static void intel_dp_link_down(struct intel_dp *intel_dp);



static int
@@ -2981,10 +2949,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, 
	intel_dp->DP = I915_READ(intel_dp->output_reg);

	intel_dp->attached_connector = intel_connector;



	if (HAS_PCH_SPLIT(dev) && port == PORT_D)

		if (intel_dpd_is_edp(dev))

			intel_dp->is_pch_edp = true;



	type = DRM_MODE_CONNECTOR_DisplayPort;

	/*

	 * FIXME : We need to initialize built-in panels before external panels.

drivers/gpu/drm/i915/intel_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -451,7 +451,6 @@ struct intel_dp { 
	uint8_t downstream_ports[DP_MAX_DOWNSTREAM_PORTS];

	struct i2c_adapter adapter;

	struct i2c_algo_dp_aux_data algo;

	bool is_pch_edp;

	uint8_t train_set[4];

	int panel_power_up_delay;

	int panel_power_down_delay;
@@ -565,7 +564,6 @@ extern void ironlake_edp_panel_on(struct intel_dp *intel_dp); 
extern void ironlake_edp_panel_off(struct intel_dp *intel_dp);

extern void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp);

extern void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync);

extern bool intel_encoder_is_pch_edp(struct drm_encoder *encoder);

extern int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane);

extern void intel_flush_display_plane(struct drm_i915_private *dev_priv,

				      enum plane plane);