[PATCH] drm/i915: squash state tracker warnings with DP MST

[PATCH] drm/i915: squash state tracker warnings with DP MST

[Dave Airlie]

From: Dave Airlie <airlied@redhat.com>

This fixes the main warning tracebacks I've been seeing here.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/i915/intel_ddi.c      | 5 +++++
 drivers/gpu/drm/i915/intel_dp_mst.c   | 2 ++
 drivers/gpu/drm/i915/intel_opregion.c | 1 +
 3 files changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 61d594f..a8728d1 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1215,6 +1215,11 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder,
 	u32 tmp;
 	int i;
 
+	if (encoder->type == INTEL_OUTPUT_DISPLAYPORT) {
+		if (enc_to_intel_dp(&encoder->base)->is_mst)
+			return false;
+	}
+
 	power_domain = intel_display_port_power_domain(encoder);
 	if (!intel_display_power_enabled(dev_priv, power_domain))
 		return false;
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index f6e7615..c432a0d 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -210,6 +210,8 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder)
 static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,
 				      enum pipe *pipe)
 {
+	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
+	*pipe = intel_mst->pipe;
 	return encoder->connectors_active;
 }
 
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index acde294..bce66b2 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -352,6 +352,7 @@ int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,
 	case INTEL_OUTPUT_UNKNOWN:
 	case INTEL_OUTPUT_DISPLAYPORT:
 	case INTEL_OUTPUT_HDMI:
+	case INTEL_OUTPUT_DP_MST:
 		type = DISPLAY_TYPE_EXTERNAL_FLAT_PANEL;
 		break;
 	case INTEL_OUTPUT_EDP:
-- 
1.9.0