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

Commit bcf53de4 authored by Stéphane Marchesin's avatar Stéphane Marchesin Committed by Daniel Vetter
Browse files

drm/i915: Preserve the DDI_A_4_LANES bit from the bios 



Otherwise the DDI_A_4_LANES bit gets lost and we can't use > 2 lanes
on eDP. This fixes eDP on hsw with > 2 lanes.

Also s/port_reversal/saved_port_bits/ since the current name is
confusing.

Signed-off-by: default avatarStéphane Marchesin <marcheu@chromium.org>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 21d8a475

drivers/gpu/drm/i915/intel_ddi.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -301,7 +301,7 @@ static void intel_ddi_mode_set(struct drm_encoder *encoder, 
		struct intel_digital_port *intel_dig_port =

		struct intel_digital_port *intel_dig_port =

			enc_to_dig_port(encoder);

			enc_to_dig_port(encoder);





		intel_dp->DP = intel_dig_port->port_reversal |

		intel_dp->DP = intel_dig_port->saved_port_bits |

			       DDI_BUF_CTL_ENABLE | DDI_BUF_EMP_400MV_0DB_HSW;

			       DDI_BUF_CTL_ENABLE | DDI_BUF_EMP_400MV_0DB_HSW;

		intel_dp->DP |= DDI_PORT_WIDTH(intel_dp->lane_count);

		intel_dp->DP |= DDI_PORT_WIDTH(intel_dp->lane_count);
@@ -1109,7 +1109,8 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder) 
		 * enabling the port.

		 * enabling the port.

		 */

		 */

		I915_WRITE(DDI_BUF_CTL(port),

		I915_WRITE(DDI_BUF_CTL(port),

			   intel_dig_port->port_reversal | DDI_BUF_CTL_ENABLE);

			   intel_dig_port->saved_port_bits |

			   DDI_BUF_CTL_ENABLE);

	} else if (type == INTEL_OUTPUT_EDP) {

	} else if (type == INTEL_OUTPUT_EDP) {

		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
@@ -1347,8 +1348,9 @@ void intel_ddi_init(struct drm_device *dev, enum port port) 
	intel_encoder->get_config = intel_ddi_get_config;

	intel_encoder->get_config = intel_ddi_get_config;





	intel_dig_port->port = port;

	intel_dig_port->port = port;

	intel_dig_port->port_reversal = I915_READ(DDI_BUF_CTL(port)) &

	intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) &

					DDI_BUF_PORT_REVERSAL;

					  (DDI_BUF_PORT_REVERSAL |

					   DDI_A_4_LANES);

	intel_dig_port->dp.output_reg = DDI_BUF_CTL(port);

	intel_dig_port->dp.output_reg = DDI_BUF_CTL(port);





	intel_encoder->type = INTEL_OUTPUT_UNKNOWN;

	intel_encoder->type = INTEL_OUTPUT_UNKNOWN;

drivers/gpu/drm/i915/intel_drv.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -504,7 +504,7 @@ struct intel_dp { 
struct intel_digital_port {

struct intel_digital_port {

	struct intel_encoder base;

	struct intel_encoder base;

	enum port port;

	enum port port;

	u32 port_reversal;

	u32 saved_port_bits;

	struct intel_dp dp;

	struct intel_dp dp;

	struct intel_hdmi hdmi;

	struct intel_hdmi hdmi;

};

};