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

Commit 958bb452 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Get rid of crtc->config in chv_data_lane_soft_reset 



Fixing chv_set_phy_signal_level() still requires too many levels of
indirection to pass crtc_state along, but chv_data_lane_soft_reset()
already has a crtc_state we can use.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181004094604.2646-13-maarten.lankhorst@linux.intel.com
parent f56f6648

drivers/gpu/drm/i915/intel_dpio_phy.c

+2 −2
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ void chv_data_lane_soft_reset(struct intel_encoder *encoder, 
		val |= DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET;

	vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW0(ch), val);



	if (crtc->config->lane_count > 2) {

	if (crtc_state->lane_count > 2) {

		val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW0(ch));

		if (reset)

			val &= ~(DPIO_PCS_TX_LANE2_RESET | DPIO_PCS_TX_LANE1_RESET);
@@ -765,7 +765,7 @@ void chv_data_lane_soft_reset(struct intel_encoder *encoder, 
		val |= DPIO_PCS_CLK_SOFT_RESET;

	vlv_dpio_write(dev_priv, pipe, VLV_PCS01_DW1(ch), val);



	if (crtc->config->lane_count > 2) {

	if (crtc_state->lane_count > 2) {

		val = vlv_dpio_read(dev_priv, pipe, VLV_PCS23_DW1(ch));

		val |= CHV_PCS_REQ_SOFTRESET_EN;

		if (reset)