From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795045659; b=EdsK/Ezt9jX//Ku4BUfPPpipeix1tXmCpGtAkxOVEUyiLtNPiD0WsIoj3uwuYHmKbCJA +Rm9fm4+IjsWBOXLPCBL/6n4pifC+eydf9DiGtiRUN57Tp4JqBfEWmbYFdSQqTUXZxi2a gY9wNLUqOK+5vwIRZmvpfBmw25C3FUsycpEpdpyRuGme6GaI5ralYN/VfKmJAJLwdwJx0 Xn4mzjrHegEgKDvjYNan/1jiy2xtvrMK6jEOLXQu9700XpCUJIk4zLj5IuKyp4sPh0Alk CdiP1Joh7mdwqK/rCkBCrHoPiu6NdA2jlYqW7eqBW+PmwtCXCb3QEjk7uihmPfZlAFQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795045659; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=bPAvuE6u9x0PNWpsBoGcpaxJRrLdj+mqiO+qYpwZrdk=; b=dGF/etLaul8kWTO4WvsgpawYVIoFdEjF8iVEkjUairELUzhYKpFtYDajIxpi12EPbF35 Nelfe2+IKTiAHzIhhhRuo5CdMdqLqng/tpKrVCNGRU81ucVcumbFfro1kponKI5pKLJd6 jGwTeirByLYyuks9CKoLkWZykPOZyQQwEfqNp4A40W5+YO9VZA0SrIoZ9d7OnEYja+xUd Sa4wL33KBVKivEgQKshumLgtQfOhkLSVj1futvLHRLnSoro/4XjeI6GgLT+xOoCmxnsPz r4FksUr1gUNY0XT0a2/XVxMdt9N73e9jG/5VBGpYeyQitwkWpFbhCEpbd5kN8mZo4KA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=EdKvWHA+; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2173B606A32C; Wed, 18 Nov 2026 23:47:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=EdKvWHA+ Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29AB91F000C4; Wed, 18 Nov 2026 23:47:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795045658; bh=bPAvuE6u9x0PNWpsBoGcpaxJRrLdj+mqiO+qYpwZrdk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EdKvWHA+byIVXW6EWl4xxn76nK2QtPy0kMRi4CRIJGZaWW6fDqLXYnsTnQyMP5CMH LNf+EcMCa6teAWyCu/Q2MUylxFbHUSh4T285wirdfRu42H3KkCJcx+ZhQ9eCGPKzFF o7grZbTYxXwRGPCPxGK1LFHwniylnyonp4cN7mm0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Keita Morisaki , Dan Wheeler , Roman Li , Alex Deucher , Sasha Levin Subject: [PATCH 6.1 1003/2857] drm/amd/display: Fix swap in median3() for DSC rate control Date: Wed, 18 Nov 2026 15:33:57 +0100 Message-ID: <20261118150237.712511366@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Keita Morisaki [ Upstream commit 7b23bf82ccbdb4cf0752f2b8686e7319a7ce497f ] median3() is meant to return the median of three values, but its last compare-and-swap step swaps b and c instead of a and b. When c is smaller than both a and b, it returns max(a, b) instead of min(a, b). For example, median3(2, 3, 1) returns 3 instead of 2. _do_calc_rc_params() always passes 0 as the first argument, and the second argument is never below 12. So whenever the third argument is negative, first_line_bpg_offset (and second_line_bpg_offset for 4:2:0) is set to the second argument instead of 0. Fix this by swapping a and b in the last step, as intended. Note that this change does not affect valid DSC configurations. The third argument is negative only when bits per pixel exceeds the uncompressed rate of the colour format: - 3 * bpc for 4:4:4, 3 * bpc + 2 for RGB - 2 * bpc for 4:2:2 - 1.5 * bpc for 4:2:0 Fixes: 97bda0322b8a ("drm/amd/display: Add DSC support for Navi (v2)") Signed-off-by: Keita Morisaki Tested-by: Dan Wheeler Reviewed-by: Roman Li Signed-off-by: Alex Deucher (cherry picked from commit 1ddc4bc97a62fc89d9d3681413d9f977e1fa1a83) Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c index ef75eb7d5adc3..940de620e3308 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c @@ -46,7 +46,7 @@ static int median3(int a, int b, int c) if (b > c) swap(b, c); if (a > b) - swap(b, c); + swap(a, b); return b; } -- 2.53.0