From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C3F2E1F5FF for ; Sat, 27 Jan 2024 22:37:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706395059; cv=none; b=PFqOb6JTWHMvPP+fY3TWPebQ9DNOtQkTARgNUOy9K2lojgXupUwdcYmPWFvnhWHGCBAtmSWNTqYt2cCpPg5a9KoB3nCmVNabsL0UGYDxYOhoPsLmO2iId4VaIsjlWModGjhkPmOc9KibxpbTd6I2qria47ws+0q8Bi3QRkusXuQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706395059; c=relaxed/simple; bh=vE1Ta06fZSLGuZhXTe8OFmEjhW3cs2+ORt0Sf+ESFcE=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=TxQBpHdDh8jun5ARq9U1+9mpTNUnUInvAd2oRaP5FltuT17D6TicQYUZX9ZDellmRG3SRm6J7+FcuBlW2y7e+j8Po9qP7/eYkDSajX3AepLt0/ZB79AUDMJwlpDQze47bdVwWiJ7jNCB7PqvhEsDszMwXbP6VAPOSO/tpdLn4DM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kZX5FnD7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="kZX5FnD7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 806E5C433F1; Sat, 27 Jan 2024 22:37:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706395059; bh=vE1Ta06fZSLGuZhXTe8OFmEjhW3cs2+ORt0Sf+ESFcE=; h=Subject:To:Cc:From:Date:From; b=kZX5FnD7TizxDWufy7fA/zXfOSlYQhKdy1LJ2ibsY0u1u11LM/eS/YTxwQZHhRD1G JQxL/rt4dOw8CwyxiHUPMUQx6eFCfktojVLnl0BndsAMjxENIO8O3V8oJPD7bv8DCm NMCI9QhLSS36Bnx/5OoO4HLb+hvRGjsbg1Tj7Ysc= Subject: FAILED: patch "[PATCH] drm/amd/display: Disable PSR-SU on Parade 0803 TCON again" failed to apply to 6.7-stable tree To: mario.limonciello@amd.com,Hamza.Mahfooz@amd.com,Marc.Rossi@amd.com,alexander.deucher@amd.com,harry.wentland@amd.com Cc: From: Date: Sat, 27 Jan 2024 14:37:38 -0800 Message-ID: <2024012738-life-negate-e401@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.7-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.7.y git checkout FETCH_HEAD git cherry-pick -x 571c2fa26aa654946447c282a09d40a56c7ff128 # git commit -s git send-email --to '' --in-reply-to '2024012738-life-negate-e401@gregkh' --subject-prefix 'PATCH 6.7.y' HEAD^.. Possible dependencies: 571c2fa26aa6 ("drm/amd/display: Disable PSR-SU on Parade 0803 TCON again") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 571c2fa26aa654946447c282a09d40a56c7ff128 Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Mon, 19 Jun 2023 15:04:24 -0500 Subject: [PATCH] drm/amd/display: Disable PSR-SU on Parade 0803 TCON again When screen brightness is rapidly changed and PSR-SU is enabled the display hangs on panels with this TCON even on the latest DCN 3.1.4 microcode (0x8002a81 at this time). This was disabled previously as commit 072030b17830 ("drm/amd: Disable PSR-SU on Parade 0803 TCON") but reverted as commit 1e66a17ce546 ("Revert "drm/amd: Disable PSR-SU on Parade 0803 TCON"") in favor of testing for a new enough microcode (commit cd2e31a9ab93 ("drm/amd/display: Set minimum requirement for using PSR-SU on Phoenix")). As hangs are still happening specifically with this TCON, disable PSR-SU again for it until it can be root caused. Cc: stable@vger.kernel.org Cc: aaron.ma@canonical.com Cc: binli@gnome.org Cc: Marc Rossi Cc: Hamza Mahfooz Signed-off-by: Mario Limonciello Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2046131 Acked-by: Alex Deucher Reviewed-by: Harry Wentland Signed-off-by: Alex Deucher diff --git a/drivers/gpu/drm/amd/display/modules/power/power_helpers.c b/drivers/gpu/drm/amd/display/modules/power/power_helpers.c index a522a7c02911..1675314a3ff2 100644 --- a/drivers/gpu/drm/amd/display/modules/power/power_helpers.c +++ b/drivers/gpu/drm/amd/display/modules/power/power_helpers.c @@ -839,6 +839,8 @@ bool is_psr_su_specific_panel(struct dc_link *link) ((dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x08) || (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x07))) isPSRSUSupported = false; + else if (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x03) + isPSRSUSupported = false; else if (dpcd_caps->psr_info.force_psrsu_cap == 0x1) isPSRSUSupported = true; }