diff mbox

[15/18] put back missing modeset

Message ID 1415019661-19435-16-git-send-email-dariusz.gadomski@canonical.com
State New
Headers show

Commit Message

Dariusz Gadomski Nov. 3, 2014, 1 p.m. UTC 
From: Dave Airlie <airlied@redhat.com>

BugLink: https://bugs.launchpad.net/bugs/1104230

(cherry picked from commit 82410c0b7f31b7f92941d4be98ef58d5ef734254 upstream)
Signed-off-by: Dariusz Gadomski <dariusz.gadomski@canonical.com>
---
 drivers/gpu/drm/i915/intel_dp_mst.c | 5 +++++
 1 file changed, 5 insertions(+)
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 2afd364..24946bd 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -102,6 +102,10 @@  static void intel_mst_disable_dp(struct intel_encoder *encoder)
 	}
 }
 
+static void intel_dp_mst_mode_set(struct intel_encoder *encoder)
+{
+}
+
 static void intel_mst_post_disable_dp(struct intel_encoder *encoder)
 {
 	struct intel_dp_mst_encoder *intel_mst = enc_to_mst(&encoder->base);
@@ -476,6 +480,7 @@  intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum
 	intel_encoder->cloneable = 0;
 
 	intel_encoder->compute_config = intel_dp_mst_compute_config;
+	intel_encoder->mode_set = intel_dp_mst_mode_set;
 	intel_encoder->disable = intel_mst_disable_dp;
 	intel_encoder->post_disable = intel_mst_post_disable_dp;
 	intel_encoder->pre_enable = intel_mst_pre_enable_dp;