[PATCH] drm/i915/dp: Fix DP MST error after unplugging TypeC cable

[srinivasan.s at intel.com]

From: Srinivasan S <srinivasan.s at intel.com>

This patch avoids DP MST payload error message in dmesg, as it is trying
to read the payload from the disconnected DP MST device. After the unplug
the connector status is disconnected and we should not be looking for the
payload and hence remove the error and throw the warning.

This details can be found in:
https://bugs.freedesktop.org/show_bug.cgi?id=111632

Signed-off-by: Srinivasan S <srinivasan.s at intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp_mst.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index eeeb3f933aa4..5b2278fdf675 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -215,7 +215,12 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder,
 
 	ret = drm_dp_update_payload_part1(&intel_dp->mst_mgr);
 	if (ret) {
-		DRM_ERROR("failed to update payload %d\n", ret);
+		if (!connector ||
+		    connector->base.status != connector_status_connected) {
+			DRM_WARN("DP MST disconnect\n");
+		} else {
+			DRM_ERROR("failed to update payload %d\n", ret);
+		}
 	}
 	if (old_crtc_state->has_audio)
 		intel_audio_codec_disable(encoder,
-- 
2.7.4