Received: by 2002:ac0:8c9a:0:0:0:0:0 with SMTP id r26csp1091200ima; Fri, 1 Feb 2019 16:21:02 -0800 (PST) X-Google-Smtp-Source: ALg8bN6k7Ltrsfj1JJh+zK39uDR95E84oGK1h7ggW3YlLVhU4HZHN+N1r0em1/dQycXlJlBsAPMi X-Received: by 2002:a63:1f1c:: with SMTP id f28mr37861566pgf.193.1549066862079; Fri, 01 Feb 2019 16:21:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549066862; cv=none; d=google.com; s=arc-20160816; b=hla2A6b4njXRnlyY2gJHusQKdTRfhSg7IHwXmpzGCdDXCuoYn2m25IAVdoIjcgtyWR CqfdxJhW6VdL12EmTlN5HY2cFpdyPwhkeJygmPyIK1X+SCOBXN89SdLJMgzNhYMYGCuL YyLWzzM8/4rXZ0Jq+waDHnsK9wHujz/1tzSTcij6poi2ML2xMfVQWZ4DDcy/Y/pYiPQh qgLl2tYJZJRewh0b3uZrA0Lny/XHaau0vScCZIa6vOlJfC8Y61TwvZkzXZ5nynemuGSY 6nFtXzi2fXMlbkO/tKq/SzjUroK55shutDh6NysBrKQN9vbf7RNMq8LLZRBmFBzKGX78 IFzg== 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=h0sQmfvARSV9gzFNejMYa/mdvLUnVXYMztsUR7Bjurg=; b=tFP+GFJe7zmDduCP5cQ3Yf4cINQ/ZSl24r5Kjjf/1qlNoMhIaRt/ex/u89rA9ArcNk nRwraynFtqZFEccqcJO9B6U9Ux/lbPsfveHAuCgWbJLS9wcu1LVnptEDHn9e7xYrnZw0 1WzXUFb5xXeJWI5LSDpzApVvcUw5uTf74/51nrwXSYwem6LV+ZGVsFxmG75ctkclrApL uJfNgFcGtHmYxPeS6UFqDNtslMk7mnZ6/wPbM9rFu0U+jI3G8xrRdx4aS82kFBVFY8m2 rpIp9wBaOd+t5RNJYkm9rjDsn2tMUX4MaLg9rfE3ienYnk6qmSIAGHII1xFv/KHVsrw6 i8rA== 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 r8si8236221pgr.252.2019.02.01.16.20.46; Fri, 01 Feb 2019 16:21:02 -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 S1726545AbfBBAUg (ORCPT + 99 others); Fri, 1 Feb 2019 19:20:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48588 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725911AbfBBAUf (ORCPT ); Fri, 1 Feb 2019 19:20:35 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D630A7AE95; Sat, 2 Feb 2019 00:20:34 +0000 (UTC) Received: from whitewolf.lyude.net.com (ovpn-120-16.rdu2.redhat.com [10.10.120.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF441608C8; Sat, 2 Feb 2019 00:20:29 +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" , "Rodrigo Vivi" , "Karol Herbst" , "Ben Skeggs" , "Jani Nikula" , "Ilia Mirkin" , intel-gfx@lists.freedesktop.org, "Joonas Lahtinen" , "Lyude Paul" Subject: [PATCH v3 0/4] drm/dp_mst: Fix regressions from new atomic VCPI helpers Date: Fri, 1 Feb 2019 19:20:00 -0500 Message-Id: <20190202002023.29665-1-lyude@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Sat, 02 Feb 2019 00:20:35 +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 | 32 +++++++++++++------------ 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, 66 insertions(+), 40 deletions(-) -- 2.20.1