Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp4093140pxb; Wed, 13 Oct 2021 20:50:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWIyvpaklTn+bZOS8XKPVoBgJpBrcVL6jFIZbGLY7bTAMifnj0ZC3Yu6+CXKjB+0FKi5+h X-Received: by 2002:a17:90a:190:: with SMTP id 16mr3758440pjc.152.1634183430444; Wed, 13 Oct 2021 20:50:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634183430; cv=none; d=google.com; s=arc-20160816; b=XBqh0C+DgCAAGMnGJVqvCKy/t2oijOMoAvXJ8UnjMTzsT4K0CiuGGNRo4gSN4U/6tF hju/jr3H1qNWQQhz6cCMnqIPfzhfpp14x0WzkiGL2qTmOCNNfobRnLQRUB1FrdxMciPD /qoZHJpB7EYV/DURgKHAlE58AbDW6sH9nv3CwGpezo3uhNypMPZauz47Y2gW6z787F0L 9yOZlZqUwUOn34SgRyUHssTFd9YOZUw2V3QOwyMJzJBYD7yZ5XxxlyoQc/+cInW4gO1k Yye6XNsjG0y47hSd7ayytCQybwHAPnd2QiyllTNinj56qcjfh4QQd42uvQSfHwkCe4mu lFzA== 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 :references:in-reply-to:message-id:date:subject:to:from; bh=toX1JAcan5o32DcgRx6powNyT+BTSrlEEjGse9Oqa5w=; b=Vux2r/aro0zKSEkvr1NGNYNfKDsN9vXDz8VC77WBkJiuWL6sCyr2GCdHhAHBlp3/dG OmQKrVd0OdtLFI90mCiw3jmZxjm1Zjda/iDh6SdqXHm2uLMuh5XzgXPw/iG+UvcOMSoN l0oXZel8qa3d0ypeyXdYGWQSkY9y/HYbWoI0VCwH/Rb8AowtcXiu5oTLWHxw67owR2BZ uAlsEJqVVgsKb+ct82JjUWQUzkh0JGdVHCfgzhzDgu9NHZ5Tvk+P9Wl1InBXeldVN76B oc/tTn5zJSozWX9AeAqmmlef4o2zqXZI4CE4NjJOdPIMmjy/4v85BBMP+IlDeGA1jTfg WHZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j15si1881968pfr.243.2021.10.13.20.50.18; Wed, 13 Oct 2021 20:50:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230063AbhJNDuq (ORCPT + 99 others); Wed, 13 Oct 2021 23:50:46 -0400 Received: from twspam01.aspeedtech.com ([211.20.114.71]:43347 "EHLO twspam01.aspeedtech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229930AbhJNDuo (ORCPT ); Wed, 13 Oct 2021 23:50:44 -0400 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 19E3Qc6R006364; Thu, 14 Oct 2021 11:26:38 +0800 (GMT-8) (envelope-from jammy_huang@aspeedtech.com) Received: from JammyHuang-PC.aspeed.com (192.168.2.115) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 14 Oct 2021 11:48:17 +0800 From: Jammy Huang To: , , , , , , , , Subject: [PATCH 6/6] media: aspeed: richer debugfs Date: Thu, 14 Oct 2021 11:48:19 +0800 Message-ID: <20211014034819.2283-7-jammy_huang@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211014034819.2283-1-jammy_huang@aspeedtech.com> References: <20211014034819.2283-1-jammy_huang@aspeedtech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [192.168.2.115] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 19E3Qc6R006364 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org updated as below: Caputre: Mode : Direct fetch VGA bpp mode : 32 Signal : Unlock Width : 1920 Height : 1080 FRC : 30 Compression: Format : JPEG Subsampling : 444 Quality : 0 HQ Mode : N/A HQ Quality : 0 Mode : N/A Performance: Frame# : 0 Frame Duration(ms) : Now : 0 Min : 0 Max : 0 FPS : 0 Signed-off-by: Jammy Huang --- drivers/media/platform/aspeed-video.c | 41 +++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index e1031fd09ac6..f2e5c49ee906 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -464,6 +464,9 @@ static const struct v4l2_dv_timings_cap aspeed_video_timings_cap = { }, }; +static const char * const compress_mode_str[] = {"DCT Only", + "DCT VQ mix 2-color", "DCT VQ mix 4-color"}; + static unsigned int debug; static void aspeed_video_init_jpeg_table(u32 *table, bool yuv420) @@ -1077,8 +1080,6 @@ static void aspeed_video_set_resolution(struct aspeed_video *video) static void aspeed_video_update_regs(struct aspeed_video *video) { - static const char * const compress_mode_str[] = {"DCT Only", - "DCT VQ mix 2-color", "DCT VQ mix 4-color"}; u32 comp_ctrl = FIELD_PREP(VE_COMP_CTRL_DCT_LUM, video->jpeg_quality) | FIELD_PREP(VE_COMP_CTRL_DCT_CHR, video->jpeg_quality | 0x10) | FIELD_PREP(VE_COMP_CTRL_EN_HQ, video->hq_mode) | @@ -1795,9 +1796,29 @@ static const struct vb2_ops aspeed_video_vb2_ops = { static int aspeed_video_debugfs_show(struct seq_file *s, void *data) { struct aspeed_video *v = s->private; + u32 val08; seq_puts(s, "\n"); + val08 = aspeed_video_read(v, VE_CTRL); + seq_puts(s, "Caputre:\n"); + if (FIELD_GET(VE_CTRL_DIRECT_FETCH, val08)) { + seq_printf(s, " %-20s:\tDirect fetch\n", "Mode"); + seq_printf(s, " %-20s:\t%s\n", "VGA bpp mode", + FIELD_GET(VE_CTRL_INT_DE, val08) ? "16" : "32"); + } else { + seq_printf(s, " %-20s:\tSync\n", "Mode"); + seq_printf(s, " %-20s:\t%s\n", "Video source", + FIELD_GET(VE_CTRL_SOURCE, val08) ? + "external" : "internal"); + seq_printf(s, " %-20s:\t%s\n", "DE source", + FIELD_GET(VE_CTRL_INT_DE, val08) ? + "internal" : "external"); + seq_printf(s, " %-20s:\t%s\n", "Cursor overlay", + FIELD_GET(VE_CTRL_AUTO_OR_CURSOR, val08) ? + "Without" : "With"); + } + seq_printf(s, " %-20s:\t%s\n", "Signal", v->v4l2_input_status ? "Unlock" : "Lock"); seq_printf(s, " %-20s:\t%d\n", "Width", v->pix_fmt.width); @@ -1806,6 +1827,21 @@ static int aspeed_video_debugfs_show(struct seq_file *s, void *data) seq_puts(s, "\n"); + seq_puts(s, "Compression:\n"); + seq_printf(s, " %-20s:\t%s\n", "Format", + v->partial_jpeg ? "Aspeed" : "JPEG"); + seq_printf(s, " %-20s:\t%s\n", "Subsampling", + v->yuv420 ? "420" : "444"); + seq_printf(s, " %-20s:\t%d\n", "Quality", v->jpeg_quality); + seq_printf(s, " %-20s:\t%s\n", "HQ Mode", + v->partial_jpeg ? (v->hq_mode ? "on" : "off") : "N/A"); + seq_printf(s, " %-20s:\t%d\n", "HQ Quality", v->jpeg_hq_quality); + seq_printf(s, " %-20s:\t%s\n", "Mode", + v->partial_jpeg ? compress_mode_str[v->compression_mode] + : "N/A"); + + seq_puts(s, "\n"); + seq_puts(s, "Performance:\n"); seq_printf(s, " %-20s:\t%d\n", "Frame#", v->sequence); seq_printf(s, " %-20s:\n", "Frame Duration(ms)"); @@ -1814,7 +1850,6 @@ static int aspeed_video_debugfs_show(struct seq_file *s, void *data) seq_printf(s, " %-18s:\t%d\n", "Max", v->perf.duration_max); seq_printf(s, " %-20s:\t%d\n", "FPS", 1000/(v->perf.totaltime/v->sequence)); - return 0; } -- 2.25.1