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

Commit 7b91bf7f authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dp: rename intel_dp_is_edp to intel_dp_is_port_edp 



Emphasize that this is based on the port, not intel_dp. This is also in
line with the underlying intel_bios_is_port_edp() function. No
functional changes.

Cc: Manasi Navare <manasi.d.navare@intel.com>
Cc: Jim Bride <jim.bride@linux.intel.com>
Reviewed-by: default avatarJim Bride <jim.bride@linux.intel.com>
Reviewed-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170818093020.19160-1-jani.nikula@intel.com
parent 1a25db65

drivers/gpu/drm/i915/intel_display.c

+3 −3
Original line number Diff line number Diff line
@@ -13643,7 +13643,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) 


	} else if (HAS_PCH_SPLIT(dev_priv)) {

		int found;

		dpd_is_edp = intel_dp_is_edp(dev_priv, PORT_D);

		dpd_is_edp = intel_dp_is_port_edp(dev_priv, PORT_D);



		if (has_edp_a(dev_priv))

			intel_dp_init(dev_priv, DP_A, PORT_A);
@@ -13686,14 +13686,14 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) 
		 * trust the port type the VBT declares as we've seen at least

		 * HDMI ports that the VBT claim are DP or eDP.

		 */

		has_edp = intel_dp_is_edp(dev_priv, PORT_B);

		has_edp = intel_dp_is_port_edp(dev_priv, PORT_B);

		has_port = intel_bios_is_port_present(dev_priv, PORT_B);

		if (I915_READ(VLV_DP_B) & DP_DETECTED || has_port)

			has_edp &= intel_dp_init(dev_priv, VLV_DP_B, PORT_B);

		if ((I915_READ(VLV_HDMIB) & SDVO_DETECTED || has_port) && !has_edp)

			intel_hdmi_init(dev_priv, VLV_HDMIB, PORT_B);



		has_edp = intel_dp_is_edp(dev_priv, PORT_C);

		has_edp = intel_dp_is_port_edp(dev_priv, PORT_C);

		has_port = intel_bios_is_port_present(dev_priv, PORT_C);

		if (I915_READ(VLV_DP_C) & DP_DETECTED || has_port)

			has_edp &= intel_dp_init(dev_priv, VLV_DP_C, PORT_C);

drivers/gpu/drm/i915/intel_dp.c

+2 −2
Original line number Diff line number Diff line
@@ -5137,7 +5137,7 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) 
}



/* check the VBT to see whether the eDP is on another port */

bool intel_dp_is_edp(struct drm_i915_private *dev_priv, enum port port)

bool intel_dp_is_port_edp(struct drm_i915_private *dev_priv, enum port port)

{

	/*

	 * eDP not supported on g4x. so bail out early just
@@ -6042,7 +6042,7 @@ 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 (intel_dp_is_edp(dev_priv, port))

	if (intel_dp_is_port_edp(dev_priv, port))

		type = DRM_MODE_CONNECTOR_eDP;

	else

		type = DRM_MODE_CONNECTOR_DisplayPort;

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1499,7 +1499,7 @@ int intel_dp_sink_crc(struct intel_dp *intel_dp, u8 *crc); 
bool intel_dp_compute_config(struct intel_encoder *encoder,

			     struct intel_crtc_state *pipe_config,

			     struct drm_connector_state *conn_state);

bool intel_dp_is_edp(struct drm_i915_private *dev_priv, enum port port);

bool intel_dp_is_port_edp(struct drm_i915_private *dev_priv, enum port port);

enum irqreturn intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port,

				  bool long_hpd);

void intel_edp_backlight_on(const struct intel_crtc_state *crtc_state,