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 4332412D218; Sun, 24 Mar 2024 22:58:34 +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=1711321114; cv=none; b=TK0hm0/V5OPGkNEaoB9r8h2F9nEpujBOjIcQVMrl5JhzT3tP3o468csdSKNQ+777R3jZfb4GIDRjeZ6M6tr0qC/w2DLXtLwrMF8y75hqOUPME5hMPNnVGor31Vm/CF4i7d6cvi8LVSFZm73roT1CqF9f/p5KX4afGGNEb3onRac= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321114; c=relaxed/simple; bh=oPWSx8SdfdjsEVzy+Z5jo84gY+npncO8mSnmQcUnbCs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J+tRHImzVX2ucWPXysm/ucp4zZzAB6uBc+NwlNEyZ7FltJyl2+wapLlsj9kN66n5k/k5A3vfdbqghJjkggYHmgldhfSoXXtutUzbZIzsi1YXAqyufp+ZlVq8+VAdLRqQOK8HdT3e1TN9crboqnn7mlYlJTLAvWnbPQdrEyqhDYs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cXTgSXiV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cXTgSXiV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37DEAC433C7; Sun, 24 Mar 2024 22:58:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321114; bh=oPWSx8SdfdjsEVzy+Z5jo84gY+npncO8mSnmQcUnbCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cXTgSXiVJSJELbQZBicNsQkP1h4J4D+9Xfo4sN1Fd2YHm0sInpADWRFAPkFRTurwA xztXM/Vcp95DOhqAO1i3XGswO8XSGhJ3I7tRlpF2KZ3lk0BFvABd6wAgUrFVVWcF61 wBl0VcEBdvyxSV5hgnTRocZZwa8irkMr8GIymsms749tbafUwca3UiL2Lggn6WCwhe B2mgihWnR3KM2AgBOsdp+MfVuWhpO1gjkDnLON3ShpVwj3H6wECp5iy9o8pP/yoAzv jhk9mUenwy9hTGndu1VrVfDl+rBDA+QTfj00lE118SjWI3Ud0CFxNOnDC8MFDIOHQ5 3Jdwr7aZF0Txg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Arthur Grillo , Pekka Paalanen , Harry Wentland , Melissa Wen , Melissa Wen , Sasha Levin Subject: [PATCH 6.7 676/713] drm: Fix drm_fixp2int_round() making it add 0.5 Date: Sun, 24 Mar 2024 18:46:42 -0400 Message-ID: <20240324224720.1345309-677-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Arthur Grillo [ Upstream commit 807f96abdf14c80f534c78f2d854c2590963345c ] As well noted by Pekka[1], the rounding of drm_fixp2int_round is wrong. To round a number, you need to add 0.5 to the number and floor that, drm_fixp2int_round() is adding 0.0000076. Make it add 0.5. [1]: https://lore.kernel.org/all/20240301135327.22efe0dd.pekka.paalanen@collabora.com/ Fixes: 8b25320887d7 ("drm: Add fixed-point helper to get rounded integer values") Suggested-by: Pekka Paalanen Reviewed-by: Harry Wentland Reviewed-by: Melissa Wen Signed-off-by: Arthur Grillo Signed-off-by: Melissa Wen Link: https://patchwork.freedesktop.org/patch/msgid/20240316-drm_fixed-v2-1-c1bc2665b5ed@riseup.net Signed-off-by: Sasha Levin --- include/drm/drm_fixed.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/drm/drm_fixed.h b/include/drm/drm_fixed.h index 0c9f917a4d4be..81572d32db0c2 100644 --- a/include/drm/drm_fixed.h +++ b/include/drm/drm_fixed.h @@ -71,7 +71,6 @@ static inline u32 dfixed_div(fixed20_12 A, fixed20_12 B) } #define DRM_FIXED_POINT 32 -#define DRM_FIXED_POINT_HALF 16 #define DRM_FIXED_ONE (1ULL << DRM_FIXED_POINT) #define DRM_FIXED_DECIMAL_MASK (DRM_FIXED_ONE - 1) #define DRM_FIXED_DIGITS_MASK (~DRM_FIXED_DECIMAL_MASK) @@ -90,7 +89,7 @@ static inline int drm_fixp2int(s64 a) static inline int drm_fixp2int_round(s64 a) { - return drm_fixp2int(a + (1 << (DRM_FIXED_POINT_HALF - 1))); + return drm_fixp2int(a + DRM_FIXED_ONE / 2); } static inline int drm_fixp2int_ceil(s64 a) -- 2.43.0