From patchwork Wed Oct 25 21:32:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 158306 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp255871vqb; Wed, 25 Oct 2023 14:43:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFgNGwF8ALKIfQCyUrCxT11fa540U3JEFJo/V/4g+jiBK5OaLZffD3ZL4Kmks9wEb/cNY+f X-Received: by 2002:a25:f07:0:b0:d80:4533:9556 with SMTP id 7-20020a250f07000000b00d8045339556mr13023534ybp.63.1698270232348; Wed, 25 Oct 2023 14:43:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698270232; cv=none; d=google.com; s=arc-20160816; b=GXmqAVWdKyFLLncxR7YczOcXjIb/csrhKjsjzlM5Fqz71vFRWUBY/Anov3ix/2gXTZ rYMBHiUIEznZYvaBmK/T8krnW6FALXKGe7zWPNdqVYAb4ZeVmjb8a2xj6UWVjx5INZnn 3CCrSkM1bfghLUC7zbsutBHo8xtG2Et/SluPNGtb6z7HcYPgnXqsOop0LCTAUJNL6kvP d+vX7cneTyfGCMa3cnV+Iy4zLC4BaJTw7MrVjj2LCvf1mXbxHMTQs/RCTyKotTdZcoXu fJTPlKuSVW6y979y/JR30gIDw/OtPjR6UatPXyh6rVFDFvkPHbAiY6Bxb5HC/KXrGRV0 WW8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=PSE4xeckRKb3xz86Jk8z81faXilq5QfiYs9qzrlEBgs=; fh=9BMPNVyN+M2P8+U/GOACWCvbM+IOw8gUwPq0mN09c7Y=; b=x3wnfpuyc/Piivkkw6JKeGhowo1g1joJ9cZinc530HtuwZyd0wVZksEMduYyBAgTG6 Mr0nk0rMJa8DcVC8/vNNry+HWazRMoNL6GNobSKgGPeNuIZZgWYQ42o+K4ofG5IYrpOH b8OAn9dhHBsafNExnwuSNrA5U5n4qZlUpwa16bpsY09YnR2jdbq0saN1pecM3pooAy9g hT7hGmIKHS5cctKRe4rSSff8peXO7X+rvKhVyS/8HKqpFPWyJkddodJujgiigjDpsW7Y Z/4bRD7yheicnFjFFs6ROlSnLp2lvUpYNwwCIHhLY9ILyktrcNiB00FMDBN1liBipC0F RuLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kwiboo.se header.s=fe-e1b5cab7be header.b="GDYEI/m1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kwiboo.se Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id y123-20020a25dc81000000b00d9cb5b26d71si11450386ybe.634.2023.10.25.14.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 14:43:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kwiboo.se header.s=fe-e1b5cab7be header.b="GDYEI/m1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kwiboo.se Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 1F61281A43CA; Wed, 25 Oct 2023 14:43:49 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229797AbjJYVni (ORCPT + 25 others); Wed, 25 Oct 2023 17:43:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229573AbjJYVnh (ORCPT ); Wed, 25 Oct 2023 17:43:37 -0400 X-Greylist: delayed 629 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 25 Oct 2023 14:43:33 PDT Received: from smtp.forwardemail.net (smtp.forwardemail.net [149.28.215.223]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96A47132 for ; Wed, 25 Oct 2023 14:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=Content-Transfer-Encoding: MIME-Version: Message-ID: Date: Subject: Cc: To: From; q=dns/txt; s=fe-e1b5cab7be; t=1698270211; bh=PSE4xeckRKb3xz86Jk8z81faXilq5QfiYs9qzrlEBgs=; b=GDYEI/m1CUdpu3BWilvchZCojANJJCajL1UyT9c8Yxf+a4cBzXM8CuOgczhK4B5jwkV84eE8p lvzVw+yNCvjw6tWNpmcKVaoLAllhBWLPN8B49xtkY1ExJouB9sASZx+tQIzgfxBynqP3zoH7cMv x6zrPiKPRHvSGfdBNpbZfgbqyaDNoZMRNYs/joL+WT1jVLMCx2CJnchu/lIFabLJ6eEs3fTtm1a rrKVg+2O/3vhlqBd3rkLe+gS3ZPw8N1U5vs1Oc7ZiFlKztYqMIOa0nAYRlVR6r0mserBJxnB7sS EKfr/gxmFIIlbDRo7d+lWhJ+o0IYL3ceUzyc4HBsACwA== From: Jonas Karlman To: Heiko Stuebner , Sandy Huang , David Airlie , Daniel Vetter Cc: Andy Yan , Christopher Obbard , Jonas Karlman , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support Date: Wed, 25 Oct 2023 21:32:46 +0000 Message-ID: <20231025213248.2641962-1-jonas@kwiboo.se> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Report-Abuse-To: abuse@forwardemail.net X-Report-Abuse: abuse@forwardemail.net X-Complaints-To: abuse@forwardemail.net X-ForwardEmail-Version: 0.4.40 X-ForwardEmail-Sender: rfc822; jonas@kwiboo.se, smtp.forwardemail.net, 149.28.215.223 X-ForwardEmail-ID: 65398986da73b54fc2dc42e3 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_DNSWL_BLOCKED, SPF_HELO_NONE,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 25 Oct 2023 14:43:49 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780765407390336762 X-GMAIL-MSGID: 1780765407390336762 Add support for the 10-bit 4:2:2 and 4:4:4 formats NV20 and NV30. These formats can be tested using modetest [1]: modetest -P @:1920x1080@ e.g. on a ROCK 3 Model A (rk3568): modetest -P 43@67:1920x1080@NV20 -F tiles,tiles modetest -P 43@67:1920x1080@NV30 -F smpte,smpte [1] https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/329 Signed-off-by: Jonas Karlman Reviewed-by: Christopher Obbard Tested-by: Christopher Obbard --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 +++++ drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index ab944010fe14..592f9d726f2e 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -326,11 +326,14 @@ static enum vop2_data_format vop2_convert_format(u32 format) case DRM_FORMAT_NV16: case DRM_FORMAT_NV61: return VOP2_FMT_YUV422SP; + case DRM_FORMAT_NV20: case DRM_FORMAT_Y210: return VOP2_FMT_YUV422SP_10; case DRM_FORMAT_NV24: case DRM_FORMAT_NV42: return VOP2_FMT_YUV444SP; + case DRM_FORMAT_NV30: + return VOP2_FMT_YUV444SP_10; case DRM_FORMAT_YUYV: case DRM_FORMAT_YVYU: return VOP2_FMT_VYUY422; @@ -415,6 +418,8 @@ static bool vop2_win_uv_swap(u32 format) case DRM_FORMAT_NV16: case DRM_FORMAT_NV24: case DRM_FORMAT_NV15: + case DRM_FORMAT_NV20: + case DRM_FORMAT_NV30: case DRM_FORMAT_YUYV: case DRM_FORMAT_UYVY: return true; diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c index fdb48571efce..0b4280218a59 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -48,8 +48,10 @@ static const uint32_t formats_rk356x_esmart[] = { DRM_FORMAT_NV15, /* yuv420_10bit linear mode, 2 plane, no padding */ DRM_FORMAT_NV16, /* yuv422_8bit linear mode, 2 plane */ DRM_FORMAT_NV61, /* yuv422_8bit linear mode, 2 plane */ + DRM_FORMAT_NV20, /* yuv422_10bit linear mode, 2 plane, no padding */ DRM_FORMAT_NV24, /* yuv444_8bit linear mode, 2 plane */ DRM_FORMAT_NV42, /* yuv444_8bit linear mode, 2 plane */ + DRM_FORMAT_NV30, /* yuv444_10bit linear mode, 2 plane, no padding */ DRM_FORMAT_YVYU, /* yuv422_8bit[YVYU] linear mode */ DRM_FORMAT_VYUY, /* yuv422_8bit[VYUY] linear mode */ };