Message ID | 20220802181115.22369-6-mario.limonciello@amd.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=hKlldDoa; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=<UNKNOWN>) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Ly33R5swMz9sGR for <incoming@patchwork.ozlabs.org>; Wed, 3 Aug 2022 04:11:46 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1oIwMh-0000iD-Je; Tue, 02 Aug 2022 18:11:35 +0000 Received: from mail-bn8nam11on2040.outbound.protection.outlook.com ([40.107.236.40] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <Mario.Limonciello@amd.com>) id 1oIwMe-0000gT-Vf for kernel-team@lists.ubuntu.com; Tue, 02 Aug 2022 18:11:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CNxrezoq44MxSgbUnOteOCgRG0zQM1T87wRdG3uOol7g51TE4oMxxJFQdUga/RQGvOMaNj8xtkCdBZ64AAxgMQbBSd7f6rNK+OYKsJ3KPVv7cCnWn3GqO0zBz8jj38ex07vxH1wGXfZ4XpyXK2ebmc2M6uU3pzJgldk2GaM2Ir9MLPT9o9xzMsNof+Cq/kbOlwF86pt8LBflH6pK57hKT7+ZCDycqEfLwnoUH8hW7oYbsLreeoSI9gdJS1NKgW+HEaY8gGJPpyQowo0pJvgqBpWxwtgG49fiPcIPzo4hpv27BwKIqk646kmG/AanO4a5TcpLNVtjOJr6rRHOzBQ3Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZoMKr4j4T4sHywE5cxEcEHARuawfgg5GM32F2t17cgo=; b=Jz1QNNviPy7/k1cmUINzCp+ohKD0OAwJL96UzC0nNLVSCRhE1GwCwk0ArIKQgWQXMSD0b8XmG4QBAnz0Jkkr47xea7RtF9EHhMx3JG77JBzzQTx261oLSe0AEuZD2MR2CR7xvIM/09pXZ99AlSnqWQnbV9HZffJCb+rgJOoVwiROInzD4F4//rr3XIYF4bjl/XaUoN47/FY/O1lq8Ogpj6Qnafg3+L+3QZZbJ/WvUNauE83W+075MjD+jicJsJxpmoGYTA8ACK8tpqJ7rkaHid1xJyfskCRSvSPfXVjXpcjkKrkXhMISiP/er/yUKfKPDQlJ134ow0vPWkZgptjRng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.ubuntu.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZoMKr4j4T4sHywE5cxEcEHARuawfgg5GM32F2t17cgo=; b=hKlldDoaWJZ7iJFnJdW/kXnjS6VBPH1Ff8q0btQtxyGdL2rZBHGJL37weRP4jsRqW0VnS2FyLlJX6jm5/Ztj5XTFKXobIc9PGgHKQAluFCgarG7dVDoWurSKEDoQkCEdccallpc82jZy+93d5xq9lbq8/qqJm3PPMlxzfoNx7PA= Received: from BN6PR2001CA0017.namprd20.prod.outlook.com (2603:10b6:404:b4::27) by DM6PR12MB3289.namprd12.prod.outlook.com (2603:10b6:5:15d::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.6; Tue, 2 Aug 2022 18:11:29 +0000 Received: from BN8NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:404:b4:cafe::d0) by BN6PR2001CA0017.outlook.office365.com (2603:10b6:404:b4::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.23 via Frontend Transport; Tue, 2 Aug 2022 18:11:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT057.mail.protection.outlook.com (10.13.177.49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5504.14 via Frontend Transport; Tue, 2 Aug 2022 18:11:29 +0000 Received: from AUS-LX-MLIMONCI.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Tue, 2 Aug 2022 13:11:27 -0500 From: Mario Limonciello <mario.limonciello@amd.com> To: <kernel-team@lists.ubuntu.com> Subject: [OEM5.14/J][SRU][PATCH v2 5/7] drm/amd/display: Fix DPIA outbox timeout after S3/S4/reset Date: Tue, 2 Aug 2022 13:11:13 -0500 Message-ID: <20220802181115.22369-6-mario.limonciello@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220802181115.22369-1-mario.limonciello@amd.com> References: <20220802181115.22369-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9c357222-ca47-4d7f-1d3b-08da74b26c2f X-MS-TrafficTypeDiagnostic: DM6PR12MB3289:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AAKMeVCSPyxNU5z3cwOyxsokVEY48NAV+ZcnLLWBsk1TrPZAhZOzu7ka/BCgxNNk/zATu93oAhDBulNt6Wr2hY4sU43+kqq1lhhnd4sio8OvzKLZkki+jcwWymleENY3e6uIxJtLA9nvxS9VXa49BZMqHBVtQI1aW6p/cvG2S9H0xJd3taucGye3iDL9X4HQUOvD0JLCA1cBos7pKtW40Q76N2OhIVMnd4nfbaG/fvb0Krbl4qHlQUcP0OHQce8KiGHOUaXrVCtSC1ubTUzm5wWmtKiN2m4948MCJjITPLJTaLZJpS8twVvJusdrQDWsUtzZ6ZpKbgulhvbxMh5WLt9CnZNzV5K+D/1LLnxD0c0pNJ/xXh2WAaFqEpz7bLkDUMVEPu+41AfKefjOjqWh2bZdgFATc+1L90H6l6zqP9xecakzUKCWzf3pDGluEiXeh0sBLZaXPDsB857qOH1Xs3sdyja3BnmTZCrakcvXog0gBHW3MtjKVby8gjSN0OULcxuSKOWtoM0IL72m+6kMbCQ9QLiDQknRF1gzfKtI5/G5a8UG145sToTbEVsASXY2Nl7xrDBd3QIPvW1T3horh97HzdV/mjx5N9kWwqxu9qCmv9qBHMHMRBCw1vrrCbtrtOqM3Pyo3k94hj9NO/uERUHNyrZMmnJlX2cE1FErhHJiYBiMRLwZK3HRIiYaEPXkdnJg25tfcvPwytisyXVwCrozVSlBTlOeBTsn4XRnInfMDQOECmSspj9sKW2RhXZnRpsx5Hb5DR9i8Vnr2pP0LUypoz+ODIkKB2kLrK/mnSoARnYWNu551IwfS8SaTTvqnU+1diWBsp/A5v+Wua9G/uhNWBprR4WpI+wXM1gFva/0gnAXA/wLm19dhlc86l3R X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(136003)(39860400002)(396003)(346002)(376002)(40470700004)(46966006)(36840700001)(426003)(5660300002)(2616005)(83380400001)(36860700001)(1076003)(186003)(16526019)(36756003)(8936002)(44832011)(70206006)(8676002)(4326008)(2906002)(70586007)(316002)(478600001)(966005)(40480700001)(82310400005)(26005)(7696005)(6916009)(54906003)(6666004)(86362001)(41300700001)(40460700003)(336012)(47076005)(81166007)(82740400003)(356005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2022 18:11:29.3592 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c357222-ca47-4d7f-1d3b-08da74b26c2f 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3289 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Cc: Anson Tsao <anson.tsao@amd.com>, Mario Limonciello <mario.limonciello@amd.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
|
expand
|
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 488a5f39656f..501187a71091 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2440,7 +2440,8 @@ static int dm_resume(void *handle) */ link_enc_cfg_init(dm->dc, dc_state); - amdgpu_dm_outbox_init(adev); + if (dc_enable_dmub_notifications(adev->dm.dc)) + amdgpu_dm_outbox_init(adev); r = dm_dmub_hw_init(adev); if (r) @@ -2489,6 +2490,10 @@ static int dm_resume(void *handle) /* TODO: Remove dc_state->dccg, use dc->dccg directly. */ dc_resource_state_construct(dm->dc, dm_state->context); + /* Re-enable outbox interrupts for DPIA. */ + if (dc_enable_dmub_notifications(adev->dm.dc)) + amdgpu_dm_outbox_init(adev); + /* Before powering on DC we need to re-initialize DMUB. */ dm_dmub_hw_resume(adev);