From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 114BEC77B7D for ; Sat, 13 May 2023 07:38:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229535AbjEMHi0 (ORCPT ); Sat, 13 May 2023 03:38:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229463AbjEMHiZ (ORCPT ); Sat, 13 May 2023 03:38:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBA3E35B5 for ; Sat, 13 May 2023 00:38:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 663CD61348 for ; Sat, 13 May 2023 07:38:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E19D6C433D2; Sat, 13 May 2023 07:38:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1683963503; bh=s742VA+bq8Lpxo9pryiTXeqTBJjMeURGqryWTpnN38E=; h=Subject:To:Cc:From:Date:From; b=lAFoAvuYkVT+tRDdLoKkL0NBUMjubRs8FxaZjECAx0wyBdRZQFnYKN5ZPnl1Xzy4P OfUHefiiroed5g/aHyq4AMjARqaRKspeNjlWNrBmFy1XoUX1LpM/FYYc19aDeGFHjK P8X1p/33AB4aeRj3A7rNWHMQfn3rrAdnlJBj52Ng= Subject: FAILED: patch "[PATCH] drm/amd/display: fix wrong index used in" failed to apply to 6.3-stable tree To: hersenxs.wu@amd.com, alexander.deucher@amd.com, daniel.wheeler@amd.com, mario.limonciello@amd.com, qingqing.zhuo@amd.com Cc: From: Date: Sat, 13 May 2023 16:19:54 +0900 Message-ID: <2023051354-scallop-nintendo-7a6b@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 6.3-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.3.y git checkout FETCH_HEAD git cherry-pick -x 2fedafc7ef071979b07fe9e9ccb7af210b65da0e # git commit -s git send-email --to '' --in-reply-to '2023051354-scallop-nintendo-7a6b@gregkh' --subject-prefix 'PATCH 6.3.y' HEAD^.. Possible dependencies: 2fedafc7ef07 ("drm/amd/display: fix wrong index used in dccg32_set_dpstreamclk") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 2fedafc7ef071979b07fe9e9ccb7af210b65da0e Mon Sep 17 00:00:00 2001 From: Hersen Wu Date: Thu, 9 Mar 2023 16:14:08 -0500 Subject: [PATCH] drm/amd/display: fix wrong index used in dccg32_set_dpstreamclk [Why & How] When merging commit 9af611f29034 ("drm/amd/display: Fix DCN32 DPSTREAMCLK_CNTL programming"), index change was not picked up. Cc: stable@vger.kernel.org Cc: Mario Limonciello Fixes: 9af611f29034 ("drm/amd/display: Fix DCN32 DPSTREAMCLK_CNTL programming") Reviewed-by: Qingqing Zhuo Acked-by: Qingqing Zhuo Signed-off-by: Hersen Wu Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c index 5dbef498580b..ffbb739d85b6 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c +++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c @@ -293,8 +293,7 @@ static void dccg32_set_dpstreamclk( dccg32_set_dtbclk_p_src(dccg, src, otg_inst); /* enabled to select one of the DTBCLKs for pipe */ - switch (otg_inst) - { + switch (dp_hpo_inst) { case 0: REG_UPDATE_2(DPSTREAMCLK_CNTL, DPSTREAMCLK0_EN,