From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 1/2] drm/i915/skl: Don't skip mst encoders in skl_ddi_pll_select() Date: Tue, 02 Feb 2016 17:15:35 +0200 Message-ID: <87lh732lew.fsf@intel.com> References: <1454423709-21882-1-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1454423709-21882-1-git-send-email-cpaul@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, David Airlie Cc: Lyude , Rob Clark List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCAwMiBGZWIgMjAxNiwgTHl1ZGUgPGNwYXVsQHJlZGhhdC5jb20+IHdyb3RlOgo+IFdl IGRvbid0IGFjdHVhbGx5IGNoZWNrIGZvciBJTlRFTF9PVVRQVVRfRFBfTVNUIGF0IGFsbCBpbiBo ZXJlLCBhcyBhCj4gcmVzdWx0IHdlIHNraXAgYXNzaWduaW5nIGEgRFBMTCB0byBhbnkgRFAgTVNU IHBvcnRzLCB3aGljaCBtYWtlcyBsaW5rCj4gdHJhaW5pbmcgZmFpbCwgYWZ0ZXIgd2hpY2ggdGhp bmdzIGp1c3Qga2VlcCBnb2luZyBkb3duaGlsbCBmcm9tIHRoZXJlLgoKQXBwYXJlbnRseSBicm9r ZW4gc2luY2UKCmNvbW1pdCA4MmQzNTQzNzAxODk1MGMyNTIwMDA1MTczM2ZiMmZiZjYzY2NhODZj CkF1dGhvcjogU2F0aGVlc2hha3Jpc2huYSBNIDxzYXRoZWVzaGFrcmlzaG5hLm1AaW50ZWwuY29t PgpEYXRlOiAgIFRodSBOb3YgMTMgMTQ6NTU6MjAgMjAxNCArMDAwMAoKICAgIGRybS9pOTE1L3Nr bDogSW1wbGVtZW50YXRpb24gb2YgU0tMIERQTEwgcHJvZ3JhbW1pbmcKCj4gQ29uc2VxdWVudGx5 LCB0aGlzIGZpeGVzIERpc3BsYXlQb3J0IE1TVCBjYXVzaW5nIGtlcm5lbCBwYW5pY3MsIG1hY2hp bmUKPiBjaGVjayBlcnJvcnMsIGV0Yy4gb24gU2t5bGFrZS4KClBsZWFzZSBjb3B5LXBhc3RlIHNv bWUgdHJhY2VzIGZvciB0aGUgY29tbWl0IG1lc3NhZ2Ugc28gaXQnbGwgYmUgZWFzaWVyCnRvIG1h dGNoIGJ1ZyByZXBvcnRzIGFuZCBmaXhlcyBsYXRlciBvbi4KCkJSLApKYW5pLgoKPgo+IFNpZ25l ZC1vZmYtYnk6IEx5dWRlIDxjcGF1bEByZWRoYXQuY29tPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kZGkuYyB8IDMgKystCj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlv bnMoKyksIDEgZGVsZXRpb24oLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kZGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCj4gaW5kZXgg ZTY0MDhlNS4uNTRhMTY1YiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kZGkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCj4gQEAgLTE1 ODksNyArMTU4OSw4IEBAIHNrbF9kZGlfcGxsX3NlbGVjdChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50 ZWxfY3J0YywKPiAgCQkJIERQTExfQ0ZHQ1IyX0tESVYod3JwbGxfcGFyYW1zLmtkaXYpIHwKPiAg CQkJIERQTExfQ0ZHQ1IyX1BESVYod3JwbGxfcGFyYW1zLnBkaXYpIHwKPiAgCQkJIHdycGxsX3Bh cmFtcy5jZW50cmFsX2ZyZXE7Cj4gLQl9IGVsc2UgaWYgKGludGVsX2VuY29kZXItPnR5cGUgPT0g SU5URUxfT1VUUFVUX0RJU1BMQVlQT1JUKSB7Cj4gKwl9IGVsc2UgaWYgKGludGVsX2VuY29kZXIt PnR5cGUgPT0gSU5URUxfT1VUUFVUX0RJU1BMQVlQT1JUIHx8Cj4gKwkJICAgaW50ZWxfZW5jb2Rl ci0+dHlwZSA9PSBJTlRFTF9PVVRQVVRfRFBfTVNUKSB7Cj4gIAkJc3dpdGNoIChjcnRjX3N0YXRl LT5wb3J0X2Nsb2NrIC8gMikgewo+ICAJCWNhc2UgODEwMDA6Cj4gIAkJCWN0cmwxIHw9IERQTExf Q1RSTDFfTElOS19SQVRFKERQTExfQ1RSTDFfTElOS19SQVRFXzgxMCwgMCk7CgotLSAKSmFuaSBO aWt1bGEsIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVyCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933069AbcBBPQJ (ORCPT ); Tue, 2 Feb 2016 10:16:09 -0500 Received: from mga09.intel.com ([134.134.136.24]:2197 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932900AbcBBPQH (ORCPT ); Tue, 2 Feb 2016 10:16:07 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,385,1449561600"; d="scan'208";a="906838910" From: Jani Nikula To: Lyude , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, David Airlie Cc: Rob Clark , Adam Jackson , Lyude Subject: Re: [PATCH 1/2] drm/i915/skl: Don't skip mst encoders in skl_ddi_pll_select() In-Reply-To: <1454423709-21882-1-git-send-email-cpaul@redhat.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1454423709-21882-1-git-send-email-cpaul@redhat.com> User-Agent: Notmuch/0.21+34~g7dd0d52 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Tue, 02 Feb 2016 17:15:35 +0200 Message-ID: <87lh732lew.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 02 Feb 2016, Lyude wrote: > We don't actually check for INTEL_OUTPUT_DP_MST at all in here, as a > result we skip assigning a DPLL to any DP MST ports, which makes link > training fail, after which things just keep going downhill from there. Apparently broken since commit 82d35437018950c25200051733fb2fbf63cca86c Author: Satheeshakrishna M Date: Thu Nov 13 14:55:20 2014 +0000 drm/i915/skl: Implementation of SKL DPLL programming > Consequently, this fixes DisplayPort MST causing kernel panics, machine > check errors, etc. on Skylake. Please copy-paste some traces for the commit message so it'll be easier to match bug reports and fixes later on. BR, Jani. > > Signed-off-by: Lyude > --- > drivers/gpu/drm/i915/intel_ddi.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c > index e6408e5..54a165b 100644 > --- a/drivers/gpu/drm/i915/intel_ddi.c > +++ b/drivers/gpu/drm/i915/intel_ddi.c > @@ -1589,7 +1589,8 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc, > DPLL_CFGCR2_KDIV(wrpll_params.kdiv) | > DPLL_CFGCR2_PDIV(wrpll_params.pdiv) | > wrpll_params.central_freq; > - } else if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT) { > + } else if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT || > + intel_encoder->type == INTEL_OUTPUT_DP_MST) { > switch (crtc_state->port_clock / 2) { > case 81000: > ctrl1 |= DPLL_CTRL1_LINK_RATE(DPLL_CTRL1_LINK_RATE_810, 0); -- Jani Nikula, Intel Open Source Technology Center