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

Commit 885a5014 authored by Jesse Barnes's avatar Jesse Barnes Committed by Keith Packard
Browse files

drm/i915/dp: remove DPMS mode tracking from DP 



We currently use this when a hot plug event is received, only checking
the link status and re-training if we had previously configured a link.
However if we want to preserve the DP configuration across both hot plug
and DPMS events (which we do for userspace apps that don't respond to
hot plug uevents), we need to unconditionally check the link and try to
bring it up on hot plug.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 899526d9

drivers/gpu/drm/i915/intel_dp.c

+1 −5
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ struct intel_dp { 
	bool has_audio;

	int force_audio;

	uint32_t color_range;

	int dpms_mode;

	uint8_t link_bw;

	uint8_t lane_count;

	uint8_t dpcd[4];
@@ -1010,7 +1009,6 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode) 
		if (is_edp(intel_dp))

			ironlake_edp_backlight_on(dev);

	}

	intel_dp->dpms_mode = mode;

}



/*
@@ -1813,7 +1811,6 @@ intel_dp_hot_plug(struct intel_encoder *intel_encoder) 
{

	struct intel_dp *intel_dp = container_of(intel_encoder, struct intel_dp, base);



	if (intel_dp->dpms_mode == DRM_MODE_DPMS_ON)

	intel_dp_check_link_status(intel_dp);

}
@@ -1882,7 +1879,6 @@ intel_dp_init(struct drm_device *dev, int output_reg) 
		return;



	intel_dp->output_reg = output_reg;

	intel_dp->dpms_mode = -1;



	intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL);

	if (!intel_connector) {