Received: from SA9PR02CU001.outbound.protection.outlook.com (mail-southcentralusazon11013046.outbound.protection.outlook.com [40.93.196.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 751A02E7F39 for ; Mon, 22 Jun 2026 17:18:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.196.46 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782148692; cv=fail; b=hgLugHbLIALc4haNa3DrBs7thsdsreJ0asAn+OXmXMocCHIEQi48QRTbOgYfRJVKsPOEZwXZJyX4y3wPP+vvTGehXaAXntXEkAKMf4sC2LbM1wRKesFSldDyHzyNgfCSaAI2/E8vYyN+1QAicZ2NzNqf1pfPfyw+ETojdyOKg6E= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782148692; c=relaxed/simple; bh=uBPQeTMc3QX7JF2ysdASI+6En51wuh9KxOemQ4jEr7A=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oxdJO14mhd9U6yvfm2c58R6eeNQdbhTHpYWiW3k3n54W/Ro8bRrSb5s9VTTJR846DikcgcimzO9+c7Qk0bVnwNCMD7glsU43FGvWKXNTAivAT8h76laLrsKQN9mKS6fyoI2dsrF6Z9LYg+HgCZwc6FjsHCWbfPpt0OKj1vVXIMY= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=a7ozUjft; arc=fail smtp.client-ip=40.93.196.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="a7ozUjft" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HPSI0psC6wQ1XKegfHETcJ54jjvbiBb51Ak77zLCkNC6us/lDuf5N5BbcSiPHTTCrX2ig2T3LTlJnn+LP/GGHX2Qh98unrXoc5GpwrhEhDrZFsyZgEFYRSTBCz8xR1vl/yCRAKhMpzHinrZbsvYRl1TNipkKmJ+SbST6gGgI7RD7Gx6Qd2QLyKciPM2LXizQY7f59fbLEEfzRP9gZ7yGmbnfxqCGai2b2OP9ki17sVGzHC+npJ+7Yz20lt4RmBak9wJI43l/5AGtwpdjDnO1VXzURirdFXJKEInH37wexOB//b/E1n3c5GdtsDEMbmwYBf1U552GS0LJxrYFPtgqQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=Z+F8p93/HdFk//on5plkksok6+ZC1Ztf9YYxsyZH9mE=; b=JupPNBMY8h6gplPn+1/eY/qWJzpy2DrelkUWqrupTfh5yzEKFj7zvLYMl+etiRP9socZNPgePJJclKPWbDw/Lt16kheUY/hZAa5032fJCMWj0dbsrKXHqacjwHK+t+etT3/s78ZrF6xblulxti+ufiupfZKgGug+IMgWML6DqrKZnOLXMUqH2FvMm2i2TKM0ji12WUXcEWIBOjP/U6WeZU+gu1Qcy/8vf1uUcbJ41q3IBtx60xNldm5czqTj7WbqAWUVO+LL7CZTbWJHiqrtmxviKA55KghaqNw0UqOCEspo3U+h6vQ+t4/uvC5eVgYIEeoRhJCHfyc7mg2dSfX+Xw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org 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 (0) 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=Z+F8p93/HdFk//on5plkksok6+ZC1Ztf9YYxsyZH9mE=; b=a7ozUjft/Y9K8uOE+uED/ViI+0RR2v4StgPcxgEhRgBlOfRWdEktd9CacW3SC2fAH6giuTtN9R76MsYDLRIKYsg1sInQXhJ4dLfHUBmblLtWRXEbl3hbXVdVLAu04/uEgAiyAicVPDl8oCMGRZAjmBq3eHfA6+xF/qqWKSh8zWg= Received: from CH2PR14CA0043.namprd14.prod.outlook.com (2603:10b6:610:56::23) by CY8PR12MB8298.namprd12.prod.outlook.com (2603:10b6:930:7c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.139.11; Mon, 22 Jun 2026 17:18:06 +0000 Received: from CH1PEPF0000AD76.namprd04.prod.outlook.com (2603:10b6:610:56:cafe::15) by CH2PR14CA0043.outlook.office365.com (2603:10b6:610:56::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.139.20 via Frontend Transport; Mon, 22 Jun 2026 17:18:06 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH1PEPF0000AD76.mail.protection.outlook.com (10.167.244.53) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.159.10 via Frontend Transport; Mon, 22 Jun 2026 17:18:06 +0000 Received: from satlexmb10.amd.com (10.181.42.219) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Mon, 22 Jun 2026 12:18:06 -0500 Received: from satlexmb07.amd.com (10.181.42.216) by satlexmb10.amd.com (10.181.42.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Mon, 22 Jun 2026 12:18:05 -0500 Received: from flamewok (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.41 via Frontend Transport; Mon, 22 Jun 2026 12:18:05 -0500 From: To: CC: , , , , , , , , , , Leo Li , Subject: [PATCH v2 3/3] Revert "drm/amd/display: Restore 5s vbl offdelay for NV3x+ DGPUs" Date: Mon, 22 Jun 2026 13:17:50 -0400 Message-ID: <20260622171752.73374-4-sunpeng.li@amd.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260622171752.73374-1-sunpeng.li@amd.com> References: <20260622171752.73374-1-sunpeng.li@amd.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD76:EE_|CY8PR12MB8298:EE_ X-MS-Office365-Filtering-Correlation-Id: d66f3603-2b59-49da-0a8d-08ded0823992 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|23010399003|1800799024|30052699003|32650700020|36860700016|376014|7416014|56012099006|11063799006|22082099003|18002099003|13003099007; X-Microsoft-Antispam-Message-Info: I6ag8HUcXuH3G0CCcKyKc6miWPvdz6LBwwwlNl7LDv+udZivuZFzTDuOIeg6lV5YKlEN3RWmfIWYmi6sU0C3ZUvyejMeR4pO/iYfd+39+yh1i+/R7hnAo7UdhgzosszwQGIkQOaSt/dyQJR9jTASQhO0J6pCpZjluX9URvv1DqMUZzlTEew9znAwRrhyGRdC+yu4UVlhScVNA0PTAJjauvfznK49EF7Mdu4Ykx2y5RZF8zFE9HV4Ojd576bE2CYcnlvCAReDfTOQZknK8DwzDAXxZjXhs3bjghkDCLqvLf82FTrpVVkXunsAr+18iavA2PM2z6qgiPCAZD0mawj1N8ehlHUe8LGDSnsvjCrrJ8jVmvXPJIVNXyi2LVA+NiHQrZR2atWxJif3kKh2w/Tr3gO0UCagE6ItyvwoA7CXKHIJtg3dZHKg5su/0EWAA7uf06iwbE0NM9JRulmD8e9aLH2A3pgjtgPOmIsPC5Jb0awieBPkFn52BM8TB+2cBfb7GbLKrInX/bHJuplHYTzN8/ab8e7zKOtq6Je0vL5dNAG6nFNbbDXfT4sydXMOud1nBp+neW4y2+vI34CW/jPeUKDm/3ZoM/HKdRArJ+cM/GaZKKQhg5iKu/4/VUGH4lNnelWdKJo0OD5oTclYiVCbMN1g+G09l5Hq6tx5p5SsKAy9Jcvv6khSA5bctFJgmZ0H5kI40Rg3Q9j/ZYMUnJTucA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(23010399003)(1800799024)(30052699003)(32650700020)(36860700016)(376014)(7416014)(56012099006)(11063799006)(22082099003)(18002099003)(13003099007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HSkcPQU0M/U8M7SDp4FbaeMfHHg8cKdDhKOXw72FD7aFW9fjdne0dCIxreaWxlo8vawgjJp5vKQ4PX7RnS06hd8chEPA99E6XqQvVSI+0X/mrCy0iZG0agzHFVZi+E96r6ii4UAxyZcS8Yo9HHo4Ahwf8vLviBBafpClCcKxBqe5Jo0/J1kUYnvhJr3unzBvq3lUiYHU+kF70fraE0RpaEQa+wxv58SnmIOtzByTcbGGZcw9913IM73AED31ILmqrBiSbtXUp+qylEhCOTtQbD8aJTMs05nykNZ9rqAr+F4rG4UKltjgsbnf/02wn9P/yCemJfDCK4x/9mVwgHkQkSrQLBw8M3b1DSy+bcKoBxO70Z6CUXeNl3lmHGQc6RA2dJACiKUOG6LpBWVdzZQqJ5h5GJ4N1/fUuNOniuB4sek47BnaV4mGPC2A/m3oqUVb X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2026 17:18:06.2808 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d66f3603-2b59-49da-0a8d-08ded0823992 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000AD76.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8298 From: Leo Li Now that proper fixes have been found, let's revert this workaround. This reverts commit 751414c12388ff2b475e15c15d3c817dcf563635. Cc: stable@vger.kernel.org Signed-off-by: Leo Li --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 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 732ddafb5cfea..8c5f5dc13a486 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3535,21 +3535,9 @@ static void manage_dm_interrupts(struct amdgpu_device *adev, if (acrtc_state) { timing = &acrtc_state->stream->timing; - if (amdgpu_ip_version(adev, DCE_HWIP, 0) >= - IP_VERSION(3, 2, 0) && - !(adev->flags & AMD_IS_APU)) { - /* - * DGPUs NV3x and newer that support idle optimizations - * experience intermittent flip-done timeouts on cursor - * updates. Restore 5s offdelay behavior for now. - * - * Discussion on the issue: - * https://lore.kernel.org/amd-gfx/20260217191632.1243826-1-sysdadmin@m1k.cloud/ - */ - config.offdelay_ms = 5000; - config.disable_immediate = false; - } else if (amdgpu_ip_version(adev, DCE_HWIP, 0) < - IP_VERSION(3, 5, 0)) { + if (amdgpu_ip_version(adev, DCE_HWIP, 0) < + IP_VERSION(3, 5, 0) || + !(adev->flags & AMD_IS_APU)) { /* * Older HW and DGPU have issues with instant off; * use a 2 frame offdelay. -- 2.54.0