From nobody Mon Feb 9 21:03:20 2026 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 6B763C001B0 for ; Thu, 10 Aug 2023 16:05:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236527AbjHJQFO (ORCPT ); Thu, 10 Aug 2023 12:05:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236508AbjHJQES (ORCPT ); Thu, 10 Aug 2023 12:04:18 -0400 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A629E30DB for ; Thu, 10 Aug 2023 09:04:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=BaAosmlx3GeI869DyRNLKn5JFf6XZu3AYAYzLrNR2sw=; b=qqW34HLABdbmcyBct/STpAT3UH LVr8qObPs6uxz29O0OGuTC4Hpg4D2nSLic6GKxTMXJAFPO9sx4jx+rMfAyk5PwJDolxZqqQqMmUAQ Y4ZtIoeZ290Q+b0BkC9NGX1AF4ZxC5RWURNdXhZ5GvqUIg0eC2LNcRyyw/fj+7GJOkrjvLAz0fNPI ZJ9nzgRngrWzTbsrOY9uaq3TEr7E5IBxhEhdrc3FbS41jT5ottMkanlM2MRI5BL5XCQBk7PeMP8a5 hTpxf1umXd5b+crrvTuX8ANbY/kc/WOcB/JGAU3ZndHRQafUe8xdGQVynbuBPojKR3iAhV94fkH+Y +kJf80mQ==; Received: from [38.44.68.151] (helo=killbill.home) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1qU88r-00GjYD-Pl; Thu, 10 Aug 2023 18:04:05 +0200 From: Melissa Wen To: amd-gfx@lists.freedesktop.org, Harry Wentland , Rodrigo Siqueira , sunpeng.li@amd.com, Alex Deucher , dri-devel@lists.freedesktop.org, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch Cc: Joshua Ashton , Sebastian Wick , Xaver Hugl , Shashank Sharma , Nicholas Kazlauskas , sungjoon.kim@amd.com, Alex Hung , Pekka Paalanen , Simon Ser , kernel-dev@igalia.com, linux-kernel@vger.kernel.org Subject: [PATCH v2 22/34] drm/amd/display: add dc_fixpt_from_s3132 helper Date: Thu, 10 Aug 2023 15:03:02 -0100 Message-Id: <20230810160314.48225-23-mwen@igalia.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230810160314.48225-1-mwen@igalia.com> References: <20230810160314.48225-1-mwen@igalia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Joshua Ashton Detach value translation from CTM to reuse it for programming HDR multiplier property. Reviewed-by: Harry Wentland Signed-off-by: Joshua Ashton Signed-off-by: Melissa Wen --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 8 +------- drivers/gpu/drm/amd/display/include/fixed31_32.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/driv= ers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c index 5659f88d1f2c..db771c895720 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c @@ -383,7 +383,6 @@ static void __drm_lut_to_dc_gamma(const struct drm_colo= r_lut *lut, static void __drm_ctm_to_dc_matrix(const struct drm_color_ctm *ctm, struct fixed31_32 *matrix) { - int64_t val; int i; =20 /* @@ -402,12 +401,7 @@ static void __drm_ctm_to_dc_matrix(const struct drm_co= lor_ctm *ctm, } =20 /* gamut_remap_matrix[i] =3D ctm[i - floor(i/4)] */ - val =3D ctm->matrix[i - (i / 4)]; - /* If negative, convert to 2's complement. */ - if (val & (1ULL << 63)) - val =3D -(val & ~(1ULL << 63)); - - matrix[i].value =3D val; + matrix[i] =3D dc_fixpt_from_s3132(ctm->matrix[i - (i / 4)]); } } =20 diff --git a/drivers/gpu/drm/amd/display/include/fixed31_32.h b/drivers/gpu= /drm/amd/display/include/fixed31_32.h index d4cf7ead1d87..84da1dd34efd 100644 --- a/drivers/gpu/drm/amd/display/include/fixed31_32.h +++ b/drivers/gpu/drm/amd/display/include/fixed31_32.h @@ -69,6 +69,18 @@ static const struct fixed31_32 dc_fixpt_epsilon =3D { 1L= L }; static const struct fixed31_32 dc_fixpt_half =3D { 0x80000000LL }; static const struct fixed31_32 dc_fixpt_one =3D { 0x100000000LL }; =20 +static inline struct fixed31_32 dc_fixpt_from_s3132(__u64 x) +{ + struct fixed31_32 val; + + /* If negative, convert to 2's complement. */ + if (x & (1ULL << 63)) + x =3D -(x & ~(1ULL << 63)); + + val.value =3D x; + return val; +} + /* * @brief * Initialization routines --=20 2.40.1