From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEF60C00449 for ; Fri, 5 Oct 2018 07:26:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C27C208E7 for ; Fri, 5 Oct 2018 07:26:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="PyoqxawH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C27C208E7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728353AbeJEOYQ (ORCPT ); Fri, 5 Oct 2018 10:24:16 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:45225 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728046AbeJEOYQ (ORCPT ); Fri, 5 Oct 2018 10:24:16 -0400 Received: by mail-ed1-f65.google.com with SMTP id v18-v6so9708171edq.12 for ; Fri, 05 Oct 2018 00:26:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to:user-agent; bh=IIMDmP0Lt+tsl8HV8fvPT4gsIWb6rH5O1sMK5wMxZrs=; b=PyoqxawHu4f6vaDG8TF3O6bq4gqZYMVgTBDXabvNC5gr4jWt6iY7XlHE2anMAWIl2b 5LV+1Hf/lx2dUWBuaT1Q/l/SXKCQyj/ha4V7x7bwn09giHRhqrtC4Ch6HOxO7DxFBG/Z 8gCZpYf3Umqxo75734vmIRH3mFf/U2fpBvqT8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to:user-agent; bh=IIMDmP0Lt+tsl8HV8fvPT4gsIWb6rH5O1sMK5wMxZrs=; b=I1LMZbw8n0Ag9trqWGsQw2paqT6PtRnhrhyjpBHfVN5CtX94cONbQbj91nmy58rYa/ kfZ4mbjnXq1R4sEVNEEvWA7KwRtlyErbIAqfiQaaSZqWiV2h+uEmJVLfN9me/tI0VKCv o8p9GPO2klobcirF61XQL1ihdoNHOikqzFZB4CN9KlkM+eoWfUPvlvATiByunx3CHHgz SEs2iC+xtY9I1xLP/GsVHiNJECSx3/4ZhAEnmS4JQPbaFAcRu+WW429PMRCLWt99pIBh 69Hrczd2MpED7s0Lcve8K/BPKvt5omv5yGrUx4rYg7OyLw3kIO6T466v3PwIV7L23/3A 3LNQ== X-Gm-Message-State: ABuFfogTqQxZG9dRxUVXAz2CkfW4RMe2kdXBu8uDarlsZ0NHafsqtR1Y psyxYVVjs0q7gmNEUEULvRycjA== X-Google-Smtp-Source: ACcGV61ft12Vw3t9Mcm4dVTihbkIojlcw3Ze4ca80LjC6qpRNIr2/4UJRymPwX2ZvtKCwoC1zBIS0w== X-Received: by 2002:a50:a2a6:: with SMTP id 35-v6mr12677576edm.276.1538724409638; Fri, 05 Oct 2018 00:26:49 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id h34-v6sm2232339eda.58.2018.10.05.00.26.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Oct 2018 00:26:47 -0700 (PDT) Date: Fri, 5 Oct 2018 09:26:45 +0200 From: Daniel Vetter To: Lyude Paul Cc: nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Daniel Vetter , Jani Nikula , stable@vger.kernel.org, Joonas Lahtinen , Rodrigo Vivi , David Airlie , linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 4/5] drm/i915: Skip vcpi allocation for MSTB ports that are gone Message-ID: <20181005072645.GW31561@phenom.ffwll.local> Mail-Followup-To: Lyude Paul , nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Jani Nikula , stable@vger.kernel.org, Joonas Lahtinen , Rodrigo Vivi , David Airlie , linux-kernel@vger.kernel.org References: <20181005002956.7317-1-lyude@redhat.com> <20181005002956.7317-5-lyude@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181005002956.7317-5-lyude@redhat.com> X-Operating-System: Linux phenom 4.14.0-1-amd64 User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 04, 2018 at 08:29:53PM -0400, Lyude Paul wrote: > Since we need to be able to allow DPMS on->off prop changes after an MST > port has disappeared from the system, we need to be able to make sure we > can compute a config for the resulting atomic commit. Currently this is > impossible when the port has disappeared, since the VCPI slot searching > we try to do in intel_dp_mst_compute_config() will fail with -EINVAL. > > Since the only commits we want to allow on no-longer-present MST ports > are ones that shut off display hardware, we already know that no VCPI > allocations are needed. So, hardcode the VCPI slot count to 0 when > intel_dp_mst_compute_config() is called on an MST port that's gone. > > Signed-off-by: Lyude Paul > Cc: stable@vger.kernel.org > --- > drivers/gpu/drm/i915/intel_dp_mst.c | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c > index fcb9b87b9339..a366f32b048a 100644 > --- a/drivers/gpu/drm/i915/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/intel_dp_mst.c > @@ -42,7 +42,7 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, > to_intel_connector(conn_state->connector); > struct drm_atomic_state *state = pipe_config->base.state; > int bpp; > - int lane_count, slots; > + int lane_count, slots = 0; > const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; > int mst_pbn; > bool reduce_m_n = drm_dp_has_quirk(&intel_dp->desc, > @@ -76,11 +76,16 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, > mst_pbn = drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp); > pipe_config->pbn = mst_pbn; > > - slots = drm_dp_atomic_find_vcpi_slots(state, &intel_dp->mst_mgr, > - connector->port, mst_pbn); > - if (slots < 0) { > - DRM_DEBUG_KMS("failed finding vcpi slots:%d\n", slots); > - return false; > + if (!connector->mst_port_gone) { Wondered why you don't need this for nouveau/amdgpu, but a bit of grepping later says they don't even bother to check that in their atomic_check functions. So if a multi-stream cable runs out of vcpi slots, they just toss up their hands, atomic be damned :-( With the s/mst_port_gone/READ_ONCE(!conn->registered)/ bikeshed: Reviewed-by: Daniel Vetter I wondered a bit whether ths fuction shouldn't just return 0 if the connector is gone, but we'd need to audit/fix other drivers first. -Daniel > + slots = drm_dp_atomic_find_vcpi_slots(state, > + &intel_dp->mst_mgr, > + connector->port, > + mst_pbn); > + if (slots < 0) { > + DRM_DEBUG_KMS("failed finding vcpi slots:%d\n", > + slots); > + return false; > + } > } > > intel_link_compute_m_n(bpp, lane_count, > -- > 2.17.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v4 4/5] drm/i915: Skip vcpi allocation for MSTB ports that are gone Date: Fri, 5 Oct 2018 09:26:45 +0200 Message-ID: <20181005072645.GW31561@phenom.ffwll.local> References: <20181005002956.7317-1-lyude@redhat.com> <20181005002956.7317-5-lyude@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20181005002956.7317-5-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Lyude Paul Cc: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, David Airlie , nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Joonas Lahtinen , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rodrigo Vivi , Jani Nikula List-Id: nouveau.vger.kernel.org T24gVGh1LCBPY3QgMDQsIDIwMTggYXQgMDg6Mjk6NTNQTSAtMDQwMCwgTHl1ZGUgUGF1bCB3cm90 ZToKPiBTaW5jZSB3ZSBuZWVkIHRvIGJlIGFibGUgdG8gYWxsb3cgRFBNUyBvbi0+b2ZmIHByb3Ag Y2hhbmdlcyBhZnRlciBhbiBNU1QKPiBwb3J0IGhhcyBkaXNhcHBlYXJlZCBmcm9tIHRoZSBzeXN0 ZW0sIHdlIG5lZWQgdG8gYmUgYWJsZSB0byBtYWtlIHN1cmUgd2UKPiBjYW4gY29tcHV0ZSBhIGNv bmZpZyBmb3IgdGhlIHJlc3VsdGluZyBhdG9taWMgY29tbWl0LiBDdXJyZW50bHkgdGhpcyBpcwo+ IGltcG9zc2libGUgd2hlbiB0aGUgcG9ydCBoYXMgZGlzYXBwZWFyZWQsIHNpbmNlIHRoZSBWQ1BJ IHNsb3Qgc2VhcmNoaW5nCj4gd2UgdHJ5IHRvIGRvIGluIGludGVsX2RwX21zdF9jb21wdXRlX2Nv bmZpZygpIHdpbGwgZmFpbCB3aXRoIC1FSU5WQUwuCj4gCj4gU2luY2UgdGhlIG9ubHkgY29tbWl0 cyB3ZSB3YW50IHRvIGFsbG93IG9uIG5vLWxvbmdlci1wcmVzZW50IE1TVCBwb3J0cwo+IGFyZSBv bmVzIHRoYXQgc2h1dCBvZmYgZGlzcGxheSBoYXJkd2FyZSwgd2UgYWxyZWFkeSBrbm93IHRoYXQg bm8gVkNQSQo+IGFsbG9jYXRpb25zIGFyZSBuZWVkZWQuIFNvLCBoYXJkY29kZSB0aGUgVkNQSSBz bG90IGNvdW50IHRvIDAgd2hlbgo+IGludGVsX2RwX21zdF9jb21wdXRlX2NvbmZpZygpIGlzIGNh bGxlZCBvbiBhbiBNU1QgcG9ydCB0aGF0J3MgZ29uZS4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBMeXVk ZSBQYXVsIDxseXVkZUByZWRoYXQuY29tPgo+IENjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnCj4g LS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jIHwgMTcgKysrKysrKysr KystLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25z KC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBfbXN0LmMKPiBpbmRleCBmY2I5Yjg3Yjkz MzkuLmEzNjZmMzJiMDQ4YSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcF9tc3QuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX21zdC5jCj4g QEAgLTQyLDcgKzQyLDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfZHBfbXN0X2NvbXB1dGVfY29uZmln KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAo+ICAJCXRvX2ludGVsX2Nvbm5lY3Rvcihj b25uX3N0YXRlLT5jb25uZWN0b3IpOwo+ICAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRl ID0gcGlwZV9jb25maWctPmJhc2Uuc3RhdGU7Cj4gIAlpbnQgYnBwOwo+IC0JaW50IGxhbmVfY291 bnQsIHNsb3RzOwo+ICsJaW50IGxhbmVfY291bnQsIHNsb3RzID0gMDsKPiAgCWNvbnN0IHN0cnVj dCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0gJnBpcGVfY29uZmlnLT5iYXNlLmFk anVzdGVkX21vZGU7Cj4gIAlpbnQgbXN0X3BibjsKPiAgCWJvb2wgcmVkdWNlX21fbiA9IGRybV9k cF9oYXNfcXVpcmsoJmludGVsX2RwLT5kZXNjLAo+IEBAIC03NiwxMSArNzYsMTYgQEAgc3RhdGlj IGJvb2wgaW50ZWxfZHBfbXN0X2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyLAo+ICAJbXN0X3BibiA9IGRybV9kcF9jYWxjX3Bibl9tb2RlKGFkanVzdGVkX21vZGUt PmNydGNfY2xvY2ssIGJwcCk7Cj4gIAlwaXBlX2NvbmZpZy0+cGJuID0gbXN0X3BibjsKPiAgCj4g LQlzbG90cyA9IGRybV9kcF9hdG9taWNfZmluZF92Y3BpX3Nsb3RzKHN0YXRlLCAmaW50ZWxfZHAt Pm1zdF9tZ3IsCj4gLQkJCQkJICAgICAgY29ubmVjdG9yLT5wb3J0LCBtc3RfcGJuKTsKPiAtCWlm IChzbG90cyA8IDApIHsKPiAtCQlEUk1fREVCVUdfS01TKCJmYWlsZWQgZmluZGluZyB2Y3BpIHNs b3RzOiVkXG4iLCBzbG90cyk7Cj4gLQkJcmV0dXJuIGZhbHNlOwo+ICsJaWYgKCFjb25uZWN0b3It Pm1zdF9wb3J0X2dvbmUpIHsKCldvbmRlcmVkIHdoeSB5b3UgZG9uJ3QgbmVlZCB0aGlzIGZvciBu b3V2ZWF1L2FtZGdwdSwgYnV0IGEgYml0IG9mIGdyZXBwaW5nCmxhdGVyIHNheXMgdGhleSBkb24n dCBldmVuIGJvdGhlciB0byBjaGVjayB0aGF0IGluIHRoZWlyIGF0b21pY19jaGVjawpmdW5jdGlv bnMuIFNvIGlmIGEgbXVsdGktc3RyZWFtIGNhYmxlIHJ1bnMgb3V0IG9mIHZjcGkgc2xvdHMsIHRo ZXkganVzdAp0b3NzIHVwIHRoZWlyIGhhbmRzLCBhdG9taWMgYmUgZGFtbmVkIDotKAoKV2l0aCB0 aGUgcy9tc3RfcG9ydF9nb25lL1JFQURfT05DRSghY29ubi0+cmVnaXN0ZXJlZCkvIGJpa2VzaGVk OgoKUmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CgpJ IHdvbmRlcmVkIGEgYml0IHdoZXRoZXIgdGhzIGZ1Y3Rpb24gc2hvdWxkbid0IGp1c3QgcmV0dXJu IDAgaWYgdGhlCmNvbm5lY3RvciBpcyBnb25lLCBidXQgd2UnZCBuZWVkIHRvIGF1ZGl0L2ZpeCBv dGhlciBkcml2ZXJzIGZpcnN0LgotRGFuaWVsCgo+ICsJCXNsb3RzID0gZHJtX2RwX2F0b21pY19m aW5kX3ZjcGlfc2xvdHMoc3RhdGUsCj4gKwkJCQkJCSAgICAgICZpbnRlbF9kcC0+bXN0X21nciwK PiArCQkJCQkJICAgICAgY29ubmVjdG9yLT5wb3J0LAo+ICsJCQkJCQkgICAgICBtc3RfcGJuKTsK PiArCQlpZiAoc2xvdHMgPCAwKSB7Cj4gKwkJCURSTV9ERUJVR19LTVMoImZhaWxlZCBmaW5kaW5n IHZjcGkgc2xvdHM6JWRcbiIsCj4gKwkJCQkgICAgICBzbG90cyk7Cj4gKwkJCXJldHVybiBmYWxz ZTsKPiArCQl9Cj4gIAl9Cj4gIAo+ICAJaW50ZWxfbGlua19jb21wdXRlX21fbihicHAsIGxhbmVf Y291bnQsCj4gLS0gCj4gMi4xNy4xCj4gCgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdp bmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTm91dmVhdSBtYWlsaW5nIGxpc3QK Tm91dmVhdUBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9ub3V2ZWF1Cg==