From patchwork Mon Nov 3 13:00:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariusz Gadomski X-Patchwork-Id: 406170 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id DA43214003E; Tue, 4 Nov 2014 00:01:33 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XlHGC-0002gB-Nf; Mon, 03 Nov 2014 13:01:28 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XlHFy-0002aq-1m for kernel-team@lists.ubuntu.com; Mon, 03 Nov 2014 13:01:14 +0000 Received: from 89-76-229-51.dynamic.chello.pl ([89.76.229.51] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1XlHFx-0007IZ-Ds for kernel-team@lists.ubuntu.com; Mon, 03 Nov 2014 13:01:13 +0000 From: Dariusz Gadomski To: kernel-team@lists.ubuntu.com Subject: [PATCH 15/18] put back missing modeset Date: Mon, 3 Nov 2014 14:00:58 +0100 Message-Id: <1415019661-19435-16-git-send-email-dariusz.gadomski@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415019661-19435-1-git-send-email-dariusz.gadomski@canonical.com> References: <1415019661-19435-1-git-send-email-dariusz.gadomski@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Dave Airlie BugLink: https://bugs.launchpad.net/bugs/1104230 (cherry picked from commit 82410c0b7f31b7f92941d4be98ef58d5ef734254 upstream) Signed-off-by: Dariusz Gadomski --- drivers/gpu/drm/i915/intel_dp_mst.c | 5 +++++ 1 file changed, 5 insertions(+) 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;