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

Commit 4e5e384c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-intel-fixes-2016-01-02' of git://anongit.freedesktop.org/drm-intel 

Pull i915 drm fixes from Jani Nikula:
 "Two display fixes still for v4.4.

  The new year's resolution is to start using signed tags per Linus'
  request.  This one is still unsigned; I want to fix this up in our
  maintainer scripts instead of doing it one-off"

* tag 'drm-intel-fixes-2016-01-02' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: increase the tries for HDMI hotplug live status checking
  drm/i915: Unbreak check_digital_port_conflicts()
parents 9c982e86 3d8acd1f

drivers/gpu/drm/i915/intel_display.c

+8 −4
Original line number Original line Diff line number Diff line
@@ -12123,18 +12123,22 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, 
static bool check_digital_port_conflicts(struct drm_atomic_state *state)

static bool check_digital_port_conflicts(struct drm_atomic_state *state)

{

{

	struct drm_device *dev = state->dev;

	struct drm_device *dev = state->dev;

	struct intel_encoder *encoder;

	struct drm_connector *connector;

	struct drm_connector *connector;

	struct drm_connector_state *connector_state;

	unsigned int used_ports = 0;

	unsigned int used_ports = 0;

	int i;





	/*

	/*

	 * Walk the connector list instead of the encoder

	 * Walk the connector list instead of the encoder

	 * list to detect the problem on ddi platforms

	 * list to detect the problem on ddi platforms

	 * where there's just one encoder per digital port.

	 * where there's just one encoder per digital port.

	 */

	 */

	for_each_connector_in_state(state, connector, connector_state, i) {

	drm_for_each_connector(connector, dev) {

		struct drm_connector_state *connector_state;

		struct intel_encoder *encoder;



		connector_state = drm_atomic_get_existing_connector_state(state, connector);

		if (!connector_state)

			connector_state = connector->state;



		if (!connector_state->best_encoder)

		if (!connector_state->best_encoder)

			continue;

			continue;

drivers/gpu/drm/i915/intel_hdmi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1381,7 +1381,7 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) 




	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);

	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);





	for (try = 0; !live_status && try < 4; try++) {

	for (try = 0; !live_status && try < 9; try++) {

		if (try)

		if (try)

			msleep(10);

			msleep(10);

		live_status = intel_digital_port_connected(dev_priv,

		live_status = intel_digital_port_connected(dev_priv,