Commit 595a19e5 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dp: s/intel_encoder/encoder/ 



Use the contemporary naming convention of struct intel_encoder *encoder.

Reviewed-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d1d3fb9254871d9a334e3f20b219bdf772426e66.1734083244.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 805cc9fe

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

+16 −16
Original line number Diff line number Diff line
@@ -5781,8 +5781,8 @@ intel_dp_force(struct drm_connector *connector) 
	struct intel_display *display = to_intel_display(connector->dev);

	struct intel_dp *intel_dp = intel_attached_dp(to_intel_connector(connector));

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	struct intel_encoder *intel_encoder = &dig_port->base;

	struct drm_i915_private *dev_priv = to_i915(intel_encoder->base.dev);

	struct intel_encoder *encoder = &dig_port->base;

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);



	drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]\n",

		    connector->base.id, connector->name);
@@ -5912,18 +5912,18 @@ void intel_dp_encoder_flush_work(struct drm_encoder *_encoder) 
	intel_dp_aux_fini(intel_dp);

}



void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder)

void intel_dp_encoder_suspend(struct intel_encoder *encoder)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder);

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);



	intel_pps_vdd_off_sync(intel_dp);



	intel_dp_tunnel_suspend(intel_dp);

}



void intel_dp_encoder_shutdown(struct intel_encoder *intel_encoder)

void intel_dp_encoder_shutdown(struct intel_encoder *encoder)

{

	struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder);

	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);



	intel_pps_wait_power_cycle(intel_dp);

}
@@ -6496,10 +6496,10 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, 
	struct intel_display *display = to_intel_display(dig_port);

	struct drm_connector *connector = &intel_connector->base;

	struct intel_dp *intel_dp = &dig_port->dp;

	struct intel_encoder *intel_encoder = &dig_port->base;

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

	struct intel_encoder *encoder = &dig_port->base;

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

	struct drm_i915_private *dev_priv = to_i915(dev);

	enum port port = intel_encoder->port;

	enum port port = encoder->port;

	int type;



	/* Initialize the work for modeset in case of link train failure */
@@ -6507,8 +6507,8 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, 


	if (drm_WARN(dev, dig_port->max_lanes < 1,

		     "Not enough lanes (%d) for DP on [ENCODER:%d:%s]\n",

		     dig_port->max_lanes, intel_encoder->base.base.id,

		     intel_encoder->base.name))

		     dig_port->max_lanes, encoder->base.base.id,

		     encoder->base.name))

		return false;



	intel_dp->reset_link_params = true;
@@ -6517,15 +6517,15 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, 
	intel_dp->DP = intel_de_read(dev_priv, intel_dp->output_reg);

	intel_dp->attached_connector = intel_connector;



	if (_intel_dp_is_port_edp(dev_priv, intel_encoder->devdata, port)) {

	if (_intel_dp_is_port_edp(dev_priv, encoder->devdata, port)) {

		/*

		 * Currently we don't support eDP on TypeC ports for DISPLAY_VER < 30,

		 * although in theory it could work on TypeC legacy ports.

		 */

		drm_WARN_ON(dev, intel_encoder_is_tc(intel_encoder) &&

		drm_WARN_ON(dev, intel_encoder_is_tc(encoder) &&

			    DISPLAY_VER(dev_priv) < 30);

		type = DRM_MODE_CONNECTOR_eDP;

		intel_encoder->type = INTEL_OUTPUT_EDP;

		encoder->type = INTEL_OUTPUT_EDP;



		/* eDP only on port B and/or C on vlv/chv */

		if (drm_WARN_ON(dev, (IS_VALLEYVIEW(dev_priv) ||
@@ -6548,7 +6548,7 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, 
	drm_dbg_kms(&dev_priv->drm,

		    "Adding %s connector on [ENCODER:%d:%s]\n",

		    type == DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP",

		    intel_encoder->base.base.id, intel_encoder->base.name);

		    encoder->base.base.id, encoder->base.name);



	drm_connector_init_with_ddc(dev, connector, &intel_dp_connector_funcs,

				    type, &intel_dp->aux.ddc);
@@ -6561,7 +6561,7 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, 
		intel_connector->polled = DRM_CONNECTOR_POLL_HPD;

	intel_connector->base.polled = intel_connector->polled;



	intel_connector_attach_encoder(intel_connector, intel_encoder);

	intel_connector_attach_encoder(intel_connector, encoder);



	if (HAS_DDI(dev_priv))

		intel_connector->get_hw_state = intel_ddi_connector_get_hw_state;