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 95BA81F614 for ; Mon, 13 May 2024 15:16:51 +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=1715613411; cv=none; b=AKp61HSZcumZfGCrI77Gn1696CPxQyhyoqVZelf2G941MUCTT47hVdTVD2ntYTxMXiLLLmB4sjsnwknSRhmT0zoLGhdBWVjUAEKe9YUbFxFP/e613aGenT2MQLfilSODQUcHlOoFqp9XTlY+3htE8sxxC8yRZUHUaox2m4ZHqY4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715613411; c=relaxed/simple; bh=WZPkgNfsWg1wco6hAKnusygGNV9Yt+R07FWe1YQ3/Oc=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Hl81NrTplnav2T0yXdz9HSHRI1hLW3BSxU3AKNBzvxprxaTOge4YFNw4vdZHwL3jEopGGsA82o8YULZWM/Bgaa55GwEjPL2Zmi9cCxzc0xv3VbzaWTQcMwY+HDswk5CjrxnsqQq91bQ3G7a8JHAxHFICEjhp53qrzJDsTM5lick= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=aOaUoEBP; 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="aOaUoEBP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D73F0C4AF0C; Mon, 13 May 2024 15:16:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715613411; bh=WZPkgNfsWg1wco6hAKnusygGNV9Yt+R07FWe1YQ3/Oc=; h=Subject:To:Cc:From:Date:From; b=aOaUoEBPPHtQ30IPJAC61nbI1xFwafJIBi0On2caIshWecIylv8R8OalfmerjBzjB i4zXxLzvoBsypZuAbVfKl4yhisG+SRCtdDD0tyxKCrET3Fy2FAwL5lNRmSCoF1FSGP mC4M9gZK3zKR3GUupYIYnNqIt93XGJxdGU1qyIpg= Subject: FAILED: patch "[PATCH] drm/amd/display: Handle Y carry-over in VCP X.Y calculation" failed to apply to 5.15-stable tree To: george.shen@amd.com,Rodrigo.Siqueira@amd.com,alexander.deucher@amd.com,daniel.wheeler@amd.com Cc: From: Date: Mon, 13 May 2024 17:16:48 +0200 Message-ID: <2024051348-consensus-polygon-1044@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 5.15-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-5.15.y git checkout FETCH_HEAD git cherry-pick -x 719564737a9ac3d0b49c314450b56cf6f7d71358 # git commit -s git send-email --to '' --in-reply-to '2024051348-consensus-polygon-1044@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 719564737a9a ("drm/amd/display: Handle Y carry-over in VCP X.Y calculation") 3bc8d9214679 ("drm/amd/display: Add DP 2.0 HPO Link Encoder") 83228ebb82e4 ("drm/amd/display: Add DP 2.0 HPO Stream Encoder") 61452908a79e ("drm/amd/display: Add DP 2.0 Audio Package Generator") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 719564737a9ac3d0b49c314450b56cf6f7d71358 Mon Sep 17 00:00:00 2001 From: George Shen Date: Thu, 16 Sep 2021 19:55:39 -0400 Subject: [PATCH] drm/amd/display: Handle Y carry-over in VCP X.Y calculation Theoretically rare corner case where ceil(Y) results in rounding up to an integer. If this happens, the 1 should be carried over to the X value. CC: stable@vger.kernel.org Reviewed-by: Rodrigo Siqueira Signed-off-by: George Shen Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c index 5b7ad38f85e0..65e45a0b4ff3 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c @@ -395,6 +395,12 @@ void dcn31_hpo_dp_link_enc_set_throttled_vcp_size( x), 25)); + // If y rounds up to integer, carry it over to x. + if (y >> 25) { + x += 1; + y = 0; + } + switch (stream_encoder_inst) { case 0: REG_SET_2(DP_DPHY_SYM32_VC_RATE_CNTL0, 0,