From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.1 035/186] drm/nouveau/kms/gv100-: fix spurious window immediate interlocks Date: Sat, 1 Jun 2019 09:14:11 -0400 Message-ID: <20190601131653.24205-35-sashal@kernel.org> References: <20190601131653.24205-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190601131653.24205-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Ben Skeggs , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org RnJvbTogQmVuIFNrZWdncyA8YnNrZWdnc0ByZWRoYXQuY29tPgoKWyBVcHN0cmVhbSBjb21taXQg ZDI0MzRlNGQ5NDJjMzJjYWRjYmRiY2QzMmM1OGYzNTA5OGYzYjYwNCBdCgpDdXJzb3IgcG9zaXRp b24gdXBkYXRlcyB3ZXJlIGFjY2lkZW50YWxseSBjYXVzaW5nIHVzIHRvIGF0dGVtcHQgdG8gaW50 ZXJsb2NrCndpbmRvdyB3aXRoIHdpbmRvdyBpbW1lZGlhdGUsIGFuZCB3aXRob3V0IGEgbWF0Y2hp bmcgd2luZG93IGltbWVkaWF0ZSB1cGRhdGUsCk5WRGlzcGxheSBjb3VsZCBoYW5nIGZvcmV2ZXIg aW4gc29tZSBjaXJjdW1zdGFuY2VzLgoKRml4ZXMgc3VzcGVuZC9yZXN1bWUgb24gKGF0IGxlYXN0 KSBRdWFkcm8gUlRYNDAwMCAoVFUxMDQpLgoKUmVwb3J0ZWQtYnk6IEx5dWRlIFBhdWwgPGx5dWRl QHJlZGhhdC5jb20+ClNpZ25lZC1vZmYtYnk6IEJlbiBTa2VnZ3MgPGJza2VnZ3NAcmVkaGF0LmNv bT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9ub3V2ZWF1L2Rpc3BudjUwL2Rpc3AuaCAgICAgfCAxICsKIGRyaXZlcnMv Z3B1L2RybS9ub3V2ZWF1L2Rpc3BudjUwL3dpbW1jMzdiLmMgfCAxICsKIGRyaXZlcnMvZ3B1L2Ry bS9ub3V2ZWF1L2Rpc3BudjUwL3duZHcuYyAgICAgfCAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDMg aW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9ub3V2ZWF1L2Rpc3BudjUwL2Rpc3AuaCBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L2Rpc3Bu djUwL2Rpc3AuaAppbmRleCAyMjE2YzU4NjIwYzJkLi43YzQxYjA1OTlkMWFjIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9kaXNwbnY1MC9kaXNwLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL25vdXZlYXUvZGlzcG52NTAvZGlzcC5oCkBAIC00MSw2ICs0MSw3IEBAIHN0cnVjdCBu djUwX2Rpc3BfaW50ZXJsb2NrIHsKIAkJTlY1MF9ESVNQX0lOVEVSTE9DS19fU0laRQogCX0gdHlw ZTsKIAl1MzIgZGF0YTsKKwl1MzIgd2ltbTsKIH07CiAKIHZvaWQgY29yZWMzN2RfbnRmeV9pbml0 KHN0cnVjdCBub3V2ZWF1X2JvICosIHUzMik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v bm91dmVhdS9kaXNwbnY1MC93aW1tYzM3Yi5jIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlz cG52NTAvd2ltbWMzN2IuYwppbmRleCA5MTAzYjg0OTQyNzljLi5mN2RiZDk2NWU0ZTcyIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9kaXNwbnY1MC93aW1tYzM3Yi5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L2Rpc3BudjUwL3dpbW1jMzdiLmMKQEAgLTc1LDYgKzc1 LDcgQEAgd2ltbWMzN2JfaW5pdF8oY29uc3Qgc3RydWN0IG52NTBfd2ltbV9mdW5jICpmdW5jLCBz dHJ1Y3Qgbm91dmVhdV9kcm0gKmRybSwKIAkJcmV0dXJuIHJldDsKIAl9CiAKKwl3bmR3LT5pbnRl cmxvY2sud2ltbSA9IHduZHctPmludGVybG9jay5kYXRhOwogCXduZHctPmltbWQgPSBmdW5jOwog CXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52 NTAvd25kdy5jIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52NTAvd25kdy5jCmluZGV4 IGI5NTE4MTAyN2IzMTcuLjQ3MWEzOWEwNzdlNTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9ub3V2ZWF1L2Rpc3BudjUwL3duZHcuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9k aXNwbnY1MC93bmR3LmMKQEAgLTE0OSw3ICsxNDksNyBAQCBudjUwX3duZHdfZmx1c2hfc2V0KHN0 cnVjdCBudjUwX3duZHcgKnduZHcsIHUzMiAqaW50ZXJsb2NrLAogCWlmIChhc3l3LT5zZXQucG9p bnQpIHsKIAkJaWYgKGFzeXctPnNldC5wb2ludCA9IGZhbHNlLCBhc3l3LT5zZXQubWFzaykKIAkJ CWludGVybG9ja1t3bmR3LT5pbnRlcmxvY2sudHlwZV0gfD0gd25kdy0+aW50ZXJsb2NrLmRhdGE7 Ci0JCWludGVybG9ja1tOVjUwX0RJU1BfSU5URVJMT0NLX1dJTU1dIHw9IHduZHctPmludGVybG9j ay5kYXRhOworCQlpbnRlcmxvY2tbTlY1MF9ESVNQX0lOVEVSTE9DS19XSU1NXSB8PSB3bmR3LT5p bnRlcmxvY2sud2ltbTsKIAogCQl3bmR3LT5pbW1kLT5wb2ludCh3bmR3LCBhc3l3KTsKIAkJd25k dy0+aW1tZC0+dXBkYXRlKHduZHcsIGludGVybG9jayk7Ci0tIAoyLjIwLjEKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCk5vdXZlYXUgbWFpbGluZyBsaXN0 Ck5vdXZlYXVAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vbm91dmVhdQ== 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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT 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 2432FC28CC4 for ; Sat, 1 Jun 2019 13:18:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F26D127278 for ; Sat, 1 Jun 2019 13:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559395114; bh=gUSPFcg3u6gsSECUBzjova+NOiDsmG6nS4+aOwcZlQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rugFqAVWUPTAyjUPpPvqqDOoGsS0isiuV12ZETRWUIpYjkI6LsONw6ZXkpdAS6fp1 4FLzUYHqVm7WfGRPgcJ67XA1FiThma+ZNndYqFUmyyO+wtXycxV+HuSXESGw/hCkje 5nie4G+78FzYYOYQS3zfQftH1n232FaoJ2dNWX8k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727828AbfFANSd (ORCPT ); Sat, 1 Jun 2019 09:18:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:45502 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727760AbfFANSa (ORCPT ); Sat, 1 Jun 2019 09:18:30 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0C9DA251C3; Sat, 1 Jun 2019 13:18:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559395109; bh=gUSPFcg3u6gsSECUBzjova+NOiDsmG6nS4+aOwcZlQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GaIC757KXiPNUpcXKK3yF0NNzENGJB3n9ZrjfOllAD1tpCyXx5NCbskrMgmwkn2CH cYhLnTYrENUpqyNdtoqR/iwZRfxUKnpnpg/iwJ1z5CLWp5wnF3Cj6peLtQD7h2i5kv B08vaqd+SjCZa0LCcKZZEgiVCUPUZ5f7YvOx7WuQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ben Skeggs , Lyude Paul , Sasha Levin , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.1 035/186] drm/nouveau/kms/gv100-: fix spurious window immediate interlocks Date: Sat, 1 Jun 2019 09:14:11 -0400 Message-Id: <20190601131653.24205-35-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190601131653.24205-1-sashal@kernel.org> References: <20190601131653.24205-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ben Skeggs [ Upstream commit d2434e4d942c32cadcbdbcd32c58f35098f3b604 ] Cursor position updates were accidentally causing us to attempt to interlock window with window immediate, and without a matching window immediate update, NVDisplay could hang forever in some circumstances. Fixes suspend/resume on (at least) Quadro RTX4000 (TU104). Reported-by: Lyude Paul Signed-off-by: Ben Skeggs Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/dispnv50/disp.h | 1 + drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c | 1 + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.h b/drivers/gpu/drm/nouveau/dispnv50/disp.h index 2216c58620c2d..7c41b0599d1ac 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.h +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.h @@ -41,6 +41,7 @@ struct nv50_disp_interlock { NV50_DISP_INTERLOCK__SIZE } type; u32 data; + u32 wimm; }; void corec37d_ntfy_init(struct nouveau_bo *, u32); diff --git a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c index 9103b8494279c..f7dbd965e4e72 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c @@ -75,6 +75,7 @@ wimmc37b_init_(const struct nv50_wimm_func *func, struct nouveau_drm *drm, return ret; } + wndw->interlock.wimm = wndw->interlock.data; wndw->immd = func; return 0; } diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c index b95181027b317..471a39a077e55 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c +++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c @@ -149,7 +149,7 @@ nv50_wndw_flush_set(struct nv50_wndw *wndw, u32 *interlock, if (asyw->set.point) { if (asyw->set.point = false, asyw->set.mask) interlock[wndw->interlock.type] |= wndw->interlock.data; - interlock[NV50_DISP_INTERLOCK_WIMM] |= wndw->interlock.data; + interlock[NV50_DISP_INTERLOCK_WIMM] |= wndw->interlock.wimm; wndw->immd->point(wndw, asyw); wndw->immd->update(wndw, interlock); -- 2.20.1