From patchwork Sun Jun 18 22:01:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 109693 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2664541vqr; Sun, 18 Jun 2023 15:24:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4i0JpGT1R9JtgUC/IkaZqVXDeUs8fwluY9Ln41tYXM3nW9Bk46OGH6Kvq96JdnuOQqRgvu X-Received: by 2002:a17:902:c948:b0:1b3:e184:70c5 with SMTP id i8-20020a170902c94800b001b3e18470c5mr18864618pla.11.1687127047968; Sun, 18 Jun 2023 15:24:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687127047; cv=none; d=google.com; s=arc-20160816; b=X09yz5Nzet9lAQ+vdMLwk+k8uvFGehgayk72L8acVdrn0RGFG4O0T71Esl/KybBoni 7p1MYDQkWwOtEeqwWi3ymS8IfeLJl2bCkhJcKNSiGHhGRUdy3VQ4BeUfN45Zb8TkX5jY tmXN8hvfsPm7MBbgfmuK7aE7GVoVzIBazu9nB1KiSi0XU1RmoVW2bCjvfRhv8Z1yUmc5 ONxnF/lL917HuGHABpyh2+NYW80hQ6vqBdoTILFFsEa8kwO0Yr+Llg7nwOlAWxU4V3AE ZmD4nd0t1sEC6SBMyx9XfHfkVUKtkvPx5yrMUJ3rsRsy0lH5YqhavTgSFGF6LsqCeDyj oGGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:mime-version :references:in-reply-to:message-id:date:subject:from:dkim-signature; bh=knW5hfOdRlNb6ad4KcvWMFXEOrQEnk5DYqTPo5HmSZE=; b=NfVaLH/ux+UM5xyy1JXBskdG0UcMmPQmf+6dCgXr6z4e8UrO+woV3PaQUyk+IRsgrj QxRz9SnyxOAIJotrnuQorVj4O9ab6TNbsrlIu/1pBz/lEmCiJixFHQw62Ax2UvSxjnOk jcAmmRRqRfkpB+GL4V5Q4CdVu2wQVWbfueKBJRcQ8KZo1AhaTJeNatH8K7w1Csx4D3zP 59uskcuoC4bqwFBWPnEoyN26lJ8wWcTcYhnzh+7tyUbTTkQFw1Q+F4Pg1Nyu5i0OvaoC EHY0eGkdsOYa8P5Ko/sYvTq9kI3Kk7548fsucg5LJylsasQsMK6DI0RwVfozt3wP977b +BYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kwiboo.se header.s=s1 header.b=nwrZNklb; 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=REJECT sp=REJECT dis=NONE) header.from=kwiboo.se Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n2-20020a170902d2c200b001b3d8ac8dacsi13963452plc.47.2023.06.18.15.23.50; Sun, 18 Jun 2023 15:24:07 -0700 (PDT) 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=@kwiboo.se header.s=s1 header.b=nwrZNklb; 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=REJECT sp=REJECT dis=NONE) header.from=kwiboo.se Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229567AbjFRWBc (ORCPT + 99 others); Sun, 18 Jun 2023 18:01:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229553AbjFRWB3 (ORCPT ); Sun, 18 Jun 2023 18:01:29 -0400 Received: from s.wrqvtbkv.outbound-mail.sendgrid.net (s.wrqvtbkv.outbound-mail.sendgrid.net [149.72.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3905C5 for ; Sun, 18 Jun 2023 15:01:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=knW5hfOdRlNb6ad4KcvWMFXEOrQEnk5DYqTPo5HmSZE=; b=nwrZNklbIibuv/B5ivfm6EIkAUlnO1nHZq/SerLKzN45UjsIjnkNqYVRDnKgzpo227Hq oHCw00h31gvAEBoLn+WoX33Z5LK+1BOoDBa/OmuSU9SjhoBuPQDX5uQzHJeWkLSCIcTQ6B aT7ZvIaH3hj7mnUyUiF6DCXCyDumgtdFcO32dhJMdsvK6NA6l6dIWadlAiKBvtGAn/MI53 QlkbXGstcmLz4OdfcjxuBpN4CZwI01g1wLfkzNj9C9jzVlyjl4cQV/06Yu6x9WRXg7a9UF v/mHzUf9i2ZafNsom3UKIrevbGPEZyWL4no+oeNVpLsHMsnIRGpFuZyPNwo4uZug== Received: by filterdrecv-84b96456cb-fbbmz with SMTP id filterdrecv-84b96456cb-fbbmz-1-648F7EB6-30 2023-06-18 22:01:26.625714618 +0000 UTC m=+3363784.259579225 Received: from bionic.localdomain (unknown) by geopod-ismtpd-5 (SG) with ESMTP id oYfsfJYrSiSN_35tLvMcIg Sun, 18 Jun 2023 22:01:26.169 +0000 (UTC) From: Jonas Karlman Subject: [PATCH v4 1/2] drm/fourcc: Add NV20 and NV30 YUV formats Date: Sun, 18 Jun 2023 22:01:27 +0000 (UTC) Message-Id: <20230618220122.3911297-2-jonas@kwiboo.se> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230618220122.3911297-1-jonas@kwiboo.se> References: <20230618220122.3911297-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h4iCR0c7B5q6rx1oDW9+4R8Lw7Z7xtsoiXwBXqJPoFzEsTzCoor3Hb++Z7TaqcwWsh9e86dziBnyfLh8E9iPkhS/UYIYEWiEPKTGYd+l+/0caCf9XHQ+En1yXRCjBhzfPbDlRCaiOD7HAlXJMyQhm81zUXjjK0bjyv+cxeCAGW3u To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Sandy Huang , Heiko Stuebner Cc: dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Jonas Karlman X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1769080931469894536?= X-GMAIL-MSGID: =?utf-8?q?1769080931469894536?= DRM_FORMAT_NV20 and DRM_FORMAT_NV30 formats is the 2x1 and non-subsampled variant of NV15, a 10-bit 2-plane YUV format that has no padding between components. Instead, luminance and chrominance samples are grouped into 4s so that each group is packed into an integer number of bytes: YYYY = UVUV = 4 * 10 bits = 40 bits = 5 bytes The '20' and '30' suffix refers to the optimum effective bits per pixel which is achieved when the total number of luminance samples is a multiple of 4. V2: Added NV30 format Signed-off-by: Jonas Karlman Reviewed-by: Sandy Huang --- drivers/gpu/drm/drm_fourcc.c | 8 ++++++++ include/uapi/drm/drm_fourcc.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c index 0f17dfa8702b..193cf8ed7912 100644 --- a/drivers/gpu/drm/drm_fourcc.c +++ b/drivers/gpu/drm/drm_fourcc.c @@ -299,6 +299,14 @@ const struct drm_format_info *__drm_format_info(u32 format) .num_planes = 2, .char_per_block = { 5, 5, 0 }, .block_w = { 4, 2, 0 }, .block_h = { 1, 1, 0 }, .hsub = 2, .vsub = 2, .is_yuv = true }, + { .format = DRM_FORMAT_NV20, .depth = 0, + .num_planes = 2, .char_per_block = { 5, 5, 0 }, + .block_w = { 4, 2, 0 }, .block_h = { 1, 1, 0 }, .hsub = 2, + .vsub = 1, .is_yuv = true }, + { .format = DRM_FORMAT_NV30, .depth = 0, + .num_planes = 2, .char_per_block = { 5, 5, 0 }, + .block_w = { 4, 2, 0 }, .block_h = { 1, 1, 0 }, .hsub = 1, + .vsub = 1, .is_yuv = true }, { .format = DRM_FORMAT_Q410, .depth = 0, .num_planes = 3, .char_per_block = { 2, 2, 2 }, .block_w = { 1, 1, 1 }, .block_h = { 1, 1, 1 }, .hsub = 1, diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index 8db7fd3f743e..3151f1fc7ebb 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -323,6 +323,8 @@ extern "C" { * index 1 = Cr:Cb plane, [39:0] Cr1:Cb1:Cr0:Cb0 little endian */ #define DRM_FORMAT_NV15 fourcc_code('N', 'V', '1', '5') /* 2x2 subsampled Cr:Cb plane */ +#define DRM_FORMAT_NV20 fourcc_code('N', 'V', '2', '0') /* 2x1 subsampled Cr:Cb plane */ +#define DRM_FORMAT_NV30 fourcc_code('N', 'V', '3', '0') /* non-subsampled Cr:Cb plane */ /* * 2 plane YCbCr MSB aligned