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

Commit 5aa56969 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Remove encoder type checks from MST suspend/resume 



Now that eDP encoders won't have can_mst==true, we can throw out
the encoder type checks from the MST suspend/resume paths.

Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1466621833-5054-3-git-send-email-ville.syrjala@linux.intel.com
parent f8e58ddf

drivers/gpu/drm/i915/intel_dp.c

+10 −18
Original line number Diff line number Diff line
@@ -5733,17 +5733,14 @@ void intel_dp_mst_suspend(struct drm_device *dev) 
	/* disable MST */

	for (i = 0; i < I915_MAX_PORTS; i++) {

		struct intel_digital_port *intel_dig_port = dev_priv->hotplug.irq_port[i];

		if (!intel_dig_port)

			continue;



		if (intel_dig_port->base.type == INTEL_OUTPUT_DISPLAYPORT) {

			if (!intel_dig_port->dp.can_mst)

		if (!intel_dig_port || !intel_dig_port->dp.can_mst)

			continue;



		if (intel_dig_port->dp.is_mst)

			drm_dp_mst_topology_mgr_suspend(&intel_dig_port->dp.mst_mgr);

	}

}

}



void intel_dp_mst_resume(struct drm_device *dev)

{
@@ -5752,18 +5749,13 @@ void intel_dp_mst_resume(struct drm_device *dev) 


	for (i = 0; i < I915_MAX_PORTS; i++) {

		struct intel_digital_port *intel_dig_port = dev_priv->hotplug.irq_port[i];

		if (!intel_dig_port)

			continue;

		if (intel_dig_port->base.type == INTEL_OUTPUT_DISPLAYPORT) {

		int ret;



			if (!intel_dig_port->dp.can_mst)

		if (!intel_dig_port || !intel_dig_port->dp.can_mst)

			continue;



		ret = drm_dp_mst_topology_mgr_resume(&intel_dig_port->dp.mst_mgr);

			if (ret != 0) {

		if (ret)

			intel_dp_check_mst_status(&intel_dig_port->dp);

	}

}
 
	}

}