Received: by 2002:ac0:8c9a:0:0:0:0:0 with SMTP id r26csp308856ima; Thu, 31 Jan 2019 17:16:04 -0800 (PST) X-Google-Smtp-Source: AHgI3IayZ3ASq0STO9Xpg0F0ZYTk46/4zLgtNEHmQsjkdSu/lWDGYcEykeYbc1lu2vxyM+BFwmqM X-Received: by 2002:a63:5207:: with SMTP id g7mr262037pgb.253.1548983764126; Thu, 31 Jan 2019 17:16:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548983764; cv=none; d=google.com; s=arc-20160816; b=AxyvsYyBUh0Gz0GxD5zQbSreFcf6hBjyHQZyvnNTTSpIpK4YjP9Ur7fBftoT8kWChT SQjXjUisXueBX1NB6DkX3dQOFybfvdqg3OkSv45zJ6s1uOxvbtGFbo2hWy/3RiZhJpAz AgxcQdMX3kNzCTzLDeIUxSa8F+5o6cKZ1Ttwq3eqaqRZF1mcQBzUQf94rgyBpZbtwMup wT3vhWbY4y1tBIs9dRFYGoSQEh3XAm9Vz83IHyENNiWPvYaZOlS8rvl1WQ4UmeWp+4Rn umSB9SWxc/8s1i7rfYsRAKMtTgdojS/ka0FGacA6OKubqW8enyXAm2GoxDfswe1nCxFu 5ahA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=j64PQ3deXHeeV0usKE81T5wbUGmPGtDltXgjm9B542Y=; b=al4JVkaiE29+yXochgLhnuGGCZOIusnG+qK5ite8KWzPBJy+Wh74HOYPymYzwOGTv1 OON0UF7HGQazxhjQH3LXm3bUdjyjFuHqLfUE60o0o8Pc7VdF18H3/kEnFaFZNcUDG/LG 3w4BIIMKL3zgSSzg5Skjg2IPtD4UkRUIbQ8+bAadLZkJz2NbhWt0Ir436clhF3KkR2rR UR9+VbPvGt73EHQ+F7IzavEIWs4F49k8GCopTmrUs2baXf/XXktq2ZNNjiNvIoYKojMd zVSXHI4Q0IWbFQQ+sB8Jk57R1n3ZsCfbBCPFXxpfSODPtuZwcfcbIVZA1TlBLJG86ivM neYA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a18si5133439pgj.77.2019.01.31.17.15.49; Thu, 31 Jan 2019 17:16:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726421AbfBABPg (ORCPT + 99 others); Thu, 31 Jan 2019 20:15:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46078 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725852AbfBABPg (ORCPT ); Thu, 31 Jan 2019 20:15:36 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 52576AC618; Fri, 1 Feb 2019 01:15:35 +0000 (UTC) Received: from whitewolf.lyude.net.com (ovpn-123-198.rdu2.redhat.com [10.10.123.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13DF65C549; Fri, 1 Feb 2019 01:15:28 +0000 (UTC) From: Lyude Paul To: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org Cc: Daniel Vetter , "David Airlie" , "Maxime Ripard" , "Maarten Lankhorst" , linux-kernel@vger.kernel.org, "Sean Paul" , "Laurent Pinchart" , "Rodrigo Vivi" , "Ben Skeggs" , "Jani Nikula" , "Ilia Mirkin" , intel-gfx@lists.freedesktop.org, "Joonas Lahtinen" , "Lyude Paul" Subject: [PATCH v2 0/4] drm/dp_mst: Fix regressions from new atomic VCPI helpers Date: Thu, 31 Jan 2019 20:14:47 -0500 Message-Id: <20190201011506.21055-1-lyude@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 01 Feb 2019 01:15:36 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This fixes the extra issues I discovered upstream after the introduction of my rework of the atomic VCPI helpers that occur during suspend/resume. This time around, we use a slightly different but much less complicated approach for fixing said issues. Cc: Daniel Vetter Lyude Paul (4): drm/dp_mst: Fix unbalanced malloc ref in drm_dp_mst_deallocate_vcpi() drm/dp_mst: Remove port validation in drm_dp_atomic_find_vcpi_slots() drm/atomic: Add drm_atomic_state->duplicated drm/nouveau: Move PBN and VCPI allocation into nv50_head_atom drivers/gpu/drm/drm_atomic_helper.c | 10 ++++- drivers/gpu/drm/drm_dp_mst_topology.c | 51 +++++++++++++++++-------- drivers/gpu/drm/i915/intel_dp_mst.c | 17 +++------ drivers/gpu/drm/nouveau/dispnv50/atom.h | 6 +++ drivers/gpu/drm/nouveau/dispnv50/disp.c | 31 ++++++++------- drivers/gpu/drm/nouveau/dispnv50/head.c | 1 + include/drm/drm_atomic.h | 9 +++++ 7 files changed, 85 insertions(+), 40 deletions(-) -- 2.20.1