From patchwork Wed Dec 7 16:07:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 30918 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp272405wrr; Wed, 7 Dec 2022 08:11:54 -0800 (PST) X-Google-Smtp-Source: AA0mqf5BmPgUqf+cmsXTgejj4uN7A1ovpKeHUv3NUFYCiU3q05tNlcvKSEIGXgjBMllxgSGmGV1g X-Received: by 2002:a17:902:f095:b0:189:95a7:7430 with SMTP id p21-20020a170902f09500b0018995a77430mr44686829pla.124.1670429514295; Wed, 07 Dec 2022 08:11:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670429514; cv=none; d=google.com; s=arc-20160816; b=YAp+g4Z1IfHXUXLpRU/WcF3scA/WjclAcywboSEM1nCZQ4nky9iDHZiZYP5piT0+Sg /21PxCuxsZVP7eE9J3cQb45Xqv1WhIRlr74ar9/tYADmeDbNZsscWjSBhcNLwCOrWR+c Mbvg3wsyfvppQq+DsYwKYF5zLDCZBoxwQR/tYuoUdEkEzQIfEsXxINvatLdrexQk8J4W ziE2P2Y57M4QrQ0OxVQy1SeAjdIPRBdCRGbwLjPStZX0ytffR4YaNWRDqD/th4mnZTnj CndAGVnZUtqN96CYquqJ6ceMGOHKymvYIZaiE/s5OkyAH5IZeLJi+Tyko5U1bZxQ2bRq unmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :feedback-id:dkim-signature:dkim-signature; bh=o3govFPZ9TDXWjhwGjG9dUBjhZnBpew2lQenIBrTic0=; b=xfa0448Q8LhgX928PAlI9evBR8qLYNN7XFQnEt+R7t3pDrakmQaqogKTtjqgYZvXmm 0ar/LLY1W9XNkWL5+RJrxUCLsVjroeS9pIalk3MzufbWaKsSDHGN/1VpSy7Lof9/BJCd JxewHF36NbwspYMX/YA/r8eak5Hv8mqwdTw4ar0V1uny31D9vl9sgwYQN1ZaQblkLUzd I/rRZzyxpN7H7fIfHveFguxnlMEpFp1J6Z/8h/IBI7x1LfNddtA3BOHjDdn3AB9bI4mB 72dnkCL0Mfg9sWWfRxC7wZLKXiXpv45XFk0x3w4ErZOun55MDX47Qgqx6OdwYAgC9Y3P x+aA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cerno.tech header.s=fm2 header.b="Lpky/gaT"; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=Cm0a8s3Y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cerno.tech Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c2-20020a170902b68200b0018905bd4a58si19148284pls.169.2022.12.07.08.11.37; Wed, 07 Dec 2022 08:11:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@cerno.tech header.s=fm2 header.b="Lpky/gaT"; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=Cm0a8s3Y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cerno.tech Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229566AbiLGQJx (ORCPT + 99 others); Wed, 7 Dec 2022 11:09:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229998AbiLGQJf (ORCPT ); Wed, 7 Dec 2022 11:09:35 -0500 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43DDF66CA9 for ; Wed, 7 Dec 2022 08:09:24 -0800 (PST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 97F9A5C00C5; Wed, 7 Dec 2022 11:09:23 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 07 Dec 2022 11:09:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1670429363; x= 1670515763; bh=o3govFPZ9TDXWjhwGjG9dUBjhZnBpew2lQenIBrTic0=; b=L pky/gaTHoHPSiTmxucEilxu9Aucfqj03cabHlZqFv9joCzF4kuw82zwjaSLKSBp7 fW0qrqK+lXUdCq5L82tY5XnSHwivbuew+sAJyv+T7V0O4EAYiUE9L23eefAWROVs Xt3y0c2SUrT05qm57CEPzWq/M/u9lEm+mkO7RN4/sHradi+Ymqd7EglVsxMt/OqO dc6LGQK4zUFdoOO+q05lGNnmXPmHHS3lwz5NPlVh3Ddj0662tMCMUgSmo++wzjJ1 +18nS1a1K11JeN/lSzFpdfBEVu6tx48uffpaPksLbP9VTMw2kphH2QIFxg42OJtT Rmkolgvvto+jX2ZeXY8AA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1670429363; x= 1670515763; bh=o3govFPZ9TDXWjhwGjG9dUBjhZnBpew2lQenIBrTic0=; b=C m0a8s3Ykv+j1YiMnCxiI7GH9WWjqFmAji3VOlRJEIfDG+CPxpbEzPTfBmZb8SLGl imi4a7LG58Aou3x9JgeJKWyttHvETaaXUuvE0ImBQ9UcxddvC1Smz7JY7TmjcPlb MfUaZXtDFxNl2+xIsxVbty/mMOJs531vtCWsNgpMl+Hxx7ZlOwy0Kb3YY8508+lA 2wJ+0d6uq6mlRCTtelLvxGWFpSChGRRUo2sa6For8CmbSmG8uwqjkGmhZndN2FYJ HslNFvdeygnQhI0TjvgnREXTYpZJmKJNgvqG6nLh8dV7GcqxbZ0ShQF+NlZNpgex HMULWfeQQrTmubK79ZM1g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudekgdekhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpeevvdelieejgedvkeffheekheeilefhgefgffehteekueelvddtueffheet ledtffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 7 Dec 2022 11:09:22 -0500 (EST) From: Maxime Ripard Date: Wed, 07 Dec 2022 17:07:53 +0100 Subject: [PATCH 9/9] drm/vc4: hdmi: Add BT.2020 Support MIME-Version: 1.0 Message-Id: <20221207-rpi-hdmi-improvements-v1-9-6b15f774c13a@cerno.tech> References: <20221207-rpi-hdmi-improvements-v1-0-6b15f774c13a@cerno.tech> In-Reply-To: <20221207-rpi-hdmi-improvements-v1-0-6b15f774c13a@cerno.tech> To: Emma Anholt , Maxime Ripard , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dave Stevenson , Maxime Ripard X-Mailer: b4 0.11.0-dev-8c583 X-Developer-Signature: v=1; a=openpgp-sha256; l=2122; i=maxime@cerno.tech; h=from:subject:message-id; bh=7EgvINvx0LZ5GQlV8rxr2sFz+Jzwj1VfMAT/EoLsgRo=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMkTdgU7T0hc8v+wYqTmitC7ZuIb++csueHh2P9OS45p+Qvp 7dEnO0pZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjCRQ0wM/6zu6ueol0qsszoQkv1S8C WzfOVF66U3L9ZGxRqsryvmLmP47+27j2Pv756ItwohC7duTG+wSEk3e7y9UkZMUlKkeVUuDwA= X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751572298632109529?= X-GMAIL-MSGID: =?utf-8?q?1751572298632109529?= From: Dave Stevenson Even though we report that we support the BT.2020 Colorspace, we were always using the BT.709 conversion matrices. Let's add the BT.2020 ones. Signed-off-by: Dave Stevenson Signed-off-by: Maxime Ripard Reviewed-by: Thomas Zimmermann --- drivers/gpu/drm/vc4/vc4_hdmi.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index e3428fb2c22d..2734cab34660 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1277,6 +1277,37 @@ static const u16 vc5_hdmi_csc_full_rgb_to_yuv_bt709[2][3][4] = { }, }; +/* + * Conversion between Full Range RGB and YUV using the BT.2020 Colorspace + * + * Matrices are signed 2p13 fixed point, with signed 9p6 offsets + */ +static const u16 vc5_hdmi_csc_full_rgb_to_yuv_bt2020[2][3][4] = { + { + /* + * Full Range + * + * [ 0.262700 0.678000 0.059300 0 ] + * [ -0.139630 -0.360370 0.500000 128 ] + * [ 0.500000 -0.459786 -0.040214 128 ] + */ + { 0x0868, 0x15b2, 0x01e6, 0x0000 }, + { 0xfb89, 0xf479, 0x1000, 0x2000 }, + { 0x1000, 0xf14a, 0xfeb8, 0x2000 }, + }, + { + /* Limited Range + * + * [ 0.224732 0.580008 0.050729 16 ] + * [ -0.122176 -0.315324 0.437500 128 ] + * [ 0.437500 -0.402312 -0.035188 128 ] + */ + { 0x082f, 0x1012, 0x031f, 0x0400 }, + { 0xfb48, 0xf6ba, 0x0e00, 0x2000 }, + { 0x0e00, 0xf448, 0xfdba, 0x2000 }, + }, +}; + static void vc5_hdmi_set_csc_coeffs(struct vc4_hdmi *vc4_hdmi, const u16 coeffs[3][4]) { @@ -1322,6 +1353,13 @@ static const u16 case DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED: case DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT: return vc5_hdmi_csc_full_rgb_to_yuv_bt709[limited]; + + case DRM_MODE_COLORIMETRY_BT2020_CYCC: + case DRM_MODE_COLORIMETRY_BT2020_YCC: + case DRM_MODE_COLORIMETRY_BT2020_RGB: + case DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65: + case DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER: + return vc5_hdmi_csc_full_rgb_to_yuv_bt2020[limited]; } }