From patchwork Mon Apr 15 15:11:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Grodzovsky X-Patchwork-Id: 10901023 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7DD8A14DB for ; Mon, 15 Apr 2019 15:12:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 667A528992 for ; Mon, 15 Apr 2019 15:12:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A9D3289A2; Mon, 15 Apr 2019 15:12:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B9020289A9 for ; Mon, 15 Apr 2019 15:12:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AA31289817; Mon, 15 Apr 2019 15:12:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from NAM04-SN1-obe.outbound.protection.outlook.com (mail-eopbgr700062.outbound.protection.outlook.com [40.107.70.62]) by gabe.freedesktop.org (Postfix) with ESMTPS id 204EE89801; Mon, 15 Apr 2019 15:12:11 +0000 (UTC) Received: from CY4PR1201CA0006.namprd12.prod.outlook.com (10.172.75.16) by MN2PR12MB2975.namprd12.prod.outlook.com (20.178.243.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1792.17; Mon, 15 Apr 2019 15:12:08 +0000 Received: from CO1NAM03FT024.eop-NAM03.prod.protection.outlook.com (2a01:111:f400:7e48::202) by CY4PR1201CA0006.outlook.office365.com (2603:10b6:910:16::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1792.14 via Frontend Transport; Mon, 15 Apr 2019 15:12:08 +0000 Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Received: from SATLEXCHOV01.amd.com (165.204.84.17) by CO1NAM03FT024.mail.protection.outlook.com (10.152.80.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1771.16 via Frontend Transport; Mon, 15 Apr 2019 15:12:07 +0000 Received: from agrodzovsky-All-Series.amd.com (10.34.1.3) by SATLEXCHOV01.amd.com (10.181.40.71) with Microsoft SMTP Server id 14.3.389.1; Mon, 15 Apr 2019 10:12:06 -0500 From: Andrey Grodzovsky To: , , , , Subject: [PATCH v2 5/5] Patch '5edb0c9b Fix deadlock with display during hanged ring recovery' Date: Mon, 15 Apr 2019 11:11:27 -0400 Message-ID: <1555341087-23339-5-git-send-email-andrey.grodzovsky@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1555341087-23339-1-git-send-email-andrey.grodzovsky@amd.com> References: <1555341087-23339-1-git-send-email-andrey.grodzovsky@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:165.204.84.17; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(396003)(346002)(376002)(136003)(2980300002)(428003)(189003)(199004)(68736007)(105586002)(36756003)(81156014)(97736004)(81166006)(8676002)(305945005)(106466001)(53416004)(50226002)(47776003)(53936002)(478600001)(72206003)(4326008)(356004)(6666004)(2201001)(11346002)(476003)(426003)(48376002)(446003)(2616005)(7696005)(50466002)(110136005)(16586007)(486006)(8936002)(126002)(44832011)(316002)(14444005)(4743002)(76176011)(104016004)(26005)(186003)(77096007)(86362001)(2906002)(51416003)(5660300002)(336012)(54906003)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR12MB2975; H:SATLEXCHOV01.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e4b2b880-2545-4242-f50f-08d6c1b4ba2c X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600140)(711020)(4605104)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328); SRVR:MN2PR12MB2975; X-MS-TrafficTypeDiagnostic: MN2PR12MB2975: X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 000800954F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: TgWkbvEczbI2sljsmlRjkHwIWLQtRHSLqX7tsRV3X7Hu3QKq4UQmnYGj/Koz2tTY1A/yah2rbXa4Zrtd2gG9CyLc8sBKDdCmZqs68B4qloDdLpNFHVZA4s+ptXZ7ZjGfETmFbXN5evEjD7B76Jg8TqRvP3vrz10X0wABRKWC8dVTFrJGLcp61QRPVBr2sxWigfaV5QaFeJJNNFjxgM08nqW8KovdZWhX2d/Cx4GqWYJF87iqe+lkaq7GLEmg0nq5ZepRwIKAZrOtVszCCDLTmuirmGcb18twn/fMH2bf9p+Vi1DAl/FMWHPEb+ts4P5at02qdKkpDdifz+tmEhKhm1OAzh5O6QVlRRNNGcfFFe3Xta+Gc+QzXI+SSZ2Iq9n61rZ0naB0NrmGkeWSxCbKMF70ABwNb5if2g+T2WrAy5I= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2019 15:12:07.6472 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e4b2b880-2545-4242-f50f-08d6c1b4ba2c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXCHOV01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB2975 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Cth0gc7YvGce1VozkXxp+YLi6UzvC1wa52Z7dTxhXDk=; b=TXyyo8XCPj4pO0TNcU0ffExHLQD3BVtV1Ig6uZsuSJw+aeKF/2yCodOiUBKlIhxF53alMqg2N1WS+9y7qo8+51gmYQheJtd1T8ZhJdvC3YCRnJpnFECCOs+eVmE131Cc5PQ+bnD1d/7gSvePwuWcXnSMnnkaxYcsth5nikoDK2k= X-Mailman-Original-Authentication-Results: spf=none (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; lists.freedesktop.org; dkim=none (message not signed) header.d=none;lists.freedesktop.org; dmarc=permerror action=none header.from=amd.com; X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas.Kazlauskas@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP was accidentaly removed during one of DALs code merges. Signed-off-by: Andrey Grodzovsky Reviewed-by: Nicholas Kazlauskas --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 5aeac2c..2bae2bf 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5297,11 +5297,16 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, abo = gem_to_amdgpu_bo(fb->obj[0]); - /* Wait for all fences on this FB */ + /* + * Wait for all fences on this FB. Do limited wait to avoid + * deadlock during GPU reset when this fence will not signal + * but we hold reservation lock for the BO. + */ r = reservation_object_wait_timeout_rcu(abo->tbo.resv, true, false, - MAX_SCHEDULE_TIMEOUT); - WARN_ON(r < 0); + msecs_to_jiffies(5000)); + if (unlikely(r <= 0)) + DRM_ERROR("Waiting for fences timed out or interrupted!"); /* * TODO This might fail and hence better not used, wait @@ -5310,10 +5315,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, * blocking commit to as per framework helpers */ r = amdgpu_bo_reserve(abo, true); - if (unlikely(r != 0)) { + if (unlikely(r != 0)) DRM_ERROR("failed to reserve buffer before flip\n"); - WARN_ON(1); - } amdgpu_bo_get_tiling_flags(abo, &tiling_flags);