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 10958248BAF; Wed, 15 Jan 2025 10:40:57 +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=1736937658; cv=none; b=g3l1UFvsct0dudPsTN2M9/IYXsyYlAz3XDMaB6tt4uaxX1e5HqiZqNNy0MKMu8CABqv8gbSuKxCX2UAVP4rBv2/2okNtK6uYg7Nw1u1/sI0sD33GdxbeU2+xkvevEKWOo1cmAhSrfoINGn1O0ZlbvP+CPhU1KnBZLPgRofhb1+0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736937658; c=relaxed/simple; bh=AWdtGDH15hUuvKITe0vF5A3aokNn8LSp6s9WHcIepiA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=smUAyuFI6g6UDn6LCQ339X4ZsId+hr890TBvkUojr8f8GG/Z1uqUdmh0nKcqhuJQ1kWTuCfoa9SWJ5z2EUFUyQ1LsPLk8QICaLwtU83IbaBrQZCUqUXM7uskgivrxMC1hJHVXwXmF43cMywczSYlbmWIakKxBNvOIqiwJbDJcws= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gVZv+IAA; 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="gVZv+IAA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF121C4CEE1; Wed, 15 Jan 2025 10:40:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1736937657; bh=AWdtGDH15hUuvKITe0vF5A3aokNn8LSp6s9WHcIepiA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gVZv+IAAmbvjRWEp4ZbsTuztSdxHqbQYLCcnoAXqC2+uACqdwxAog9LNlleVvnD0n wsErvHp9yWhQH54OJ37KDe/H2Sm/yRoM/9dojFAnWIIj+2P6haiZtu766XTQ5plkir jH5WTFm9NiJzLj0q5ubohPUK514vka17R5mU6j0I= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mario Limonciello , Alvin Lee , Roman Li , Daniel Wheeler , Alex Deucher Subject: [PATCH 6.1 43/92] drm/amd/display: Add check for granularity in dml ceil/floor helpers Date: Wed, 15 Jan 2025 11:37:01 +0100 Message-ID: <20250115103549.251486598@linuxfoundation.org> X-Mailer: git-send-email 2.48.0 In-Reply-To: <20250115103547.522503305@linuxfoundation.org> References: <20250115103547.522503305@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Roman Li commit 0881fbc4fd62e00a2b8e102725f76d10351b2ea8 upstream. [Why] Wrapper functions for dcn_bw_ceil2() and dcn_bw_floor2() should check for granularity is non zero to avoid assert and divide-by-zero error in dcn_bw_ functions. [How] Add check for granularity 0. Cc: Mario Limonciello Reviewed-by: Alvin Lee Signed-off-by: Roman Li Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher (cherry picked from commit f6e09701c3eb2ccb8cb0518e0b67f1c69742a4ec) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h +++ b/drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h @@ -66,11 +66,15 @@ static inline double dml_max5(double a, static inline double dml_ceil(double a, double granularity) { + if (granularity == 0) + return 0; return (double) dcn_bw_ceil2(a, granularity); } static inline double dml_floor(double a, double granularity) { + if (granularity == 0) + return 0; return (double) dcn_bw_floor2(a, granularity); } @@ -114,11 +118,15 @@ static inline double dml_ceil_2(double f static inline double dml_ceil_ex(double x, double granularity) { + if (granularity == 0) + return 0; return (double) dcn_bw_ceil2(x, granularity); } static inline double dml_floor_ex(double x, double granularity) { + if (granularity == 0) + return 0; return (double) dcn_bw_floor2(x, granularity); }