From patchwork Mon Sep 30 02:55:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chia-Lin Kao (AceLan)" X-Patchwork-Id: 1990717 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XH5Kj5kXrz1xtY for ; Mon, 30 Sep 2024 12:55:36 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sv6ZK-0006rF-L9; Mon, 30 Sep 2024 02:55:26 +0000 Received: from mail-pl1-f177.google.com ([209.85.214.177]) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sv6ZI-0006qZ-Ik for kernel-team@lists.ubuntu.com; Mon, 30 Sep 2024 02:55:24 +0000 Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-20b8be13cb1so3932855ad.1 for ; Sun, 29 Sep 2024 19:55:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727664922; x=1728269722; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ym0ffGuRQDZorYlkubWuj2jadSG5hY+SR9UJiI2IVa8=; b=sYLGRVSi++04pKgUzRpnJSWA7WmpzLJqCrLGC9njqnQZ+CF49lXP/2j8bvBoBr2jZT ItG+P6IZ5q5qMnow49sc/kQE7kPkXXkOg56s6ZMZEl0qpGsASK98zzRIBXa8KoyYkDoY LQ90ecMKsTmf1uGj2LHtjvZYX4iibzYiJmrEp4dZnFAkXPbXQ1vBzYshj1GRI6+9Nifq sZjsWDhmafWEMw/x+WTUdLzPR/QkqC7WcQtHuyoay6vMMT15Eh6/i/xKFBZw+G9jVU5o uQMGdGX9rbIs6pXUBfbm8ztliultCwy72s+v2Nm/3tsTiBWXQ7BhF6T83iOxCXQOPVSI Z7sQ== X-Gm-Message-State: AOJu0YwndBU2wNx4iryIOgmmpUscaFc5ycRdtDlISbNIx+hY+UCAVlUa KwY+BjVE1t/dJIohO6tbQz5/aZs97OiX8GzlNK83H4U6XCcFqpC7YhUpeA2K X-Google-Smtp-Source: AGHT+IHJLJFZx/ILw3qzeZPsW9OFTEdGOHdW9H4ur8JHI8w/0ukyBGihINUoESHwx/aev3unjgpCew== X-Received: by 2002:a17:902:d490:b0:20b:8f04:b053 with SMTP id d9443c01a7336-20b8f04c6damr14834915ad.22.1727664921998; Sun, 29 Sep 2024 19:55:21 -0700 (PDT) Received: from localhost (211-75-139-220.hinet-ip.hinet.net. [211.75.139.220]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20b37e14e08sm45456055ad.149.2024.09.29.19.55.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Sep 2024 19:55:21 -0700 (PDT) From: "Chia-Lin Kao (AceLan)" To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][N][O] UBUNTU: SAUCE: drm/amd/display: Fix system hang while resume with TBT monitor Date: Mon, 30 Sep 2024 10:55:17 +0800 Message-ID: <20240930025517.3895411-2-acelan.kao@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240930025517.3895411-1-acelan.kao@canonical.com> References: <20240930025517.3895411-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.177; envelope-from=acelan@gmail.com; helo=mail-pl1-f177.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Tom Chung BugLink: https://bugs.launchpad.net/bugs/2083182 [Why] Connected with a Thunderbolt monitor and do the suspend and the system may hang while resume. The TBT monitor HPD will be triggered during the resume procedure and call the drm_client_modeset_probe() while struct drm_connector connector->dev->master is NULL. It will mess up the pipe topology after resume. [How] Skip the TBT monitor HPD during the resume procedure because we currently will probe the connectors after resume by default. Reviewed-by: Wayne Lin Signed-off-by: Tom Chung Signed-off-by: Fangzhi Zuo (cherry picked from commit https://lore.kernel.org/all/20240927170103.102180-3-Jerry.Zuo@amd.com/T/#e868f6b967ec79ae85c5a8a446be9b5d5c97e5427) Signed-off-by: Chia-Lin Kao (AceLan) --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++++ 1 file changed, 6 insertions(+) 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 a830b74cf4cb..6471448506df 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -756,6 +756,12 @@ static void dmub_hpd_callback(struct amdgpu_device *adev, return; } + /* Skip DMUB HPD IRQ in suspend/resume. We will probe them later. */ + if (notify->type == DMUB_NOTIFICATION_HPD && adev->in_suspend) { + DRM_INFO("Skip DMUB HPD IRQ callback in suspend/resume\n"); + return; + } + link_index = notify->link_index; link = adev->dm.dc->links[link_index]; dev = adev->dm.ddev;