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 DD80E318EDC for ; Sat, 21 Mar 2026 06:39:21 +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=1774075162; cv=none; b=dC+ayBNOMXhbQQqBr4ONlLeekO/t/gKtXROlI0puTgWr0h0Rl8hLK5lNHypTorK6052aR7PghvmwWiVPCaT/GNgQZPka7cA5A29+uU2VPpLjbVLvZv3BDEl91PZYmDtv/jt4rkiylRlJtRsXGcalS8UNw30KOOiWlAGsA8cDknE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774075162; c=relaxed/simple; bh=aBB6J2FjipZ0l92q9FLsrDWJrmpv3KHEt/aoyhwIoyY=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Xwgh2xp3j5JvbhHF0lb++3xuy/9rUoMMKjYTZ/KwudGkJHG64j4ZrGH+e8rQrUbd9vVbMN8cy7y5VHpZU0V6+pXCCvQgL3nzLCUXnyDDEJ7cjMxhQ6lDofRTbQN/DfiVVECM3BvcTP9JwN/W8XixVBhD+A9OHgVypSM1gl2/UIk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dW1Z5Eh3; 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="dW1Z5Eh3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06DFDC19421; Sat, 21 Mar 2026 06:39:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774075161; bh=aBB6J2FjipZ0l92q9FLsrDWJrmpv3KHEt/aoyhwIoyY=; h=Subject:To:Cc:From:Date:From; b=dW1Z5Eh3Cd9pHkNw1weiu/an2rQIH7IbgnCQwako2t6FynmGCdrKaANdlUw4TF0xd Ar9ygTLbbiGNSUIisl7VdmwykX8s1DUt+aF2057p2+zfV54f6dPFdJgYnC1ktPYjSX ZBUSGVZeFuyCSce3iMEORU1KMg9Q3Sv916yAAELU= Subject: FAILED: patch "[PATCH] drm/amd/display: Wrap dcn32_override_min_req_memclk() in" failed to apply to 6.6-stable tree To: xry111@xry111.site,alex.hung@amd.com,alexander.deucher@amd.com,liaronce@hotmail.com Cc: From: Date: Sat, 21 Mar 2026 07:38:52 +0100 Message-ID: <2026032152-backstage-spool-d8a1@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.6-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.6.y git checkout FETCH_HEAD git cherry-pick -x ebe82c6e75cfc547154d0fd843b0dd6cca3d548f # git commit -s git send-email --to '' --in-reply-to '2026032152-backstage-spool-d8a1@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ebe82c6e75cfc547154d0fd843b0dd6cca3d548f Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 6 Mar 2026 14:28:03 +0800 Subject: [PATCH] drm/amd/display: Wrap dcn32_override_min_req_memclk() in DC_FP_{START, END} [Why] The dcn32_override_min_req_memclk function is in dcn32_fpu.c, which is compiled with CC_FLAGS_FPU into FP instructions. So when we call it we must use DC_FP_{START,END} to save and restore the FP context, and prepare the FP unit on architectures like LoongArch where the FP unit isn't always on. Reported-by: LiarOnce Fixes: ee7be8f3de1c ("drm/amd/display: Limit DCN32 8 channel or less parts to DPM1 for FPO") Signed-off-by: Xi Ruoyao Reviewed-by: Alex Hung Signed-off-by: Alex Deucher (cherry picked from commit 25bb1d54ba3983c064361033a8ec15474fece37e) Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c index 7ebb7d1193af..c7fd604024d6 100644 --- a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c +++ b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c @@ -1785,7 +1785,10 @@ static bool dml1_validate(struct dc *dc, struct dc_state *context, enum dc_valid dc->res_pool->funcs->calculate_wm_and_dlg(dc, context, pipes, pipe_cnt, vlevel); + DC_FP_START(); dcn32_override_min_req_memclk(dc, context); + DC_FP_END(); + dcn32_override_min_req_dcfclk(dc, context); BW_VAL_TRACE_END_WATERMARKS();