Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp4094053pxb; Wed, 13 Oct 2021 20:51:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqftgr8546p43bqPAZrCjsj2Vjzsj0UuhrBOeH3EB1dzjnYbl3Yz3PM3qeJaplPSZSgw4u X-Received: by 2002:a17:90b:4b46:: with SMTP id mi6mr3065237pjb.161.1634183512471; Wed, 13 Oct 2021 20:51:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634183512; cv=none; d=google.com; s=arc-20160816; b=gLPsYe89p/+/WQcH807WxXoOV1R+ItQiMVOoQLiCbHeyOB1jdMFSLJgeaoNTlLcsBT AwaCh9FESEcpq5T+OeIaJrjMKIBQng9gcf7oxvP+Nd49i1g1f5CJMKOLKIFcrGXTtgM9 nfr6tukWkRSdaz7tw6BSB2LWF0O6aS4yOXTiz0lOgyqmkqg4Lh/o/OfybWXz6RAKUbqG 4CtHWkZkkdEUiN5lzqkF4aH2FrgTTq7EqEr3PjxTj8iScpOLf5kDwJQ8nDJ+xwN5vr71 GW9fg67KDZO4hreWmKoRYF/cNTfknM0YZF533N1KR/0s+TlevEQK4IjWn7AyqVL9tFgf 3LGQ== 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=C8rODK4Hmf9lnPqUAa0TfW7vIcS2rcXQbVppkr3dg2o=; b=WRrNWeBKnqJL3Ileh8JkzLzBNnWuxeorUIBQj3HjeuZNgKG4CzerDbUsRE9DH7wnmv uTfw6nmKILhYJHI6CtmDgZkYczjtlOr8/GDbusa065JdlzaBOTd29VkjU1GhvmmX8bSH wj96cGH+mDrSJ0ksl4SxNAFxG6TfdI6MHBqcKGTNDKwfUd8pTyKWXo5TnM7J6y2lcZ/Q tBIjrtZ2OtKnd/XP5niNjxYdcbJbnhIBq8FTQ7gmAuXI0t5LbiduGQgdLJx5VtGjpaSl 33qAu9peVSGRNyL8hSwoeJvQ+8QdWU/v8XQv5BfWs/YpoL7qBXYfyepj5GyoXkoXC3ak XoHw== 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 na16si11770241pjb.128.2021.10.13.20.51.40; Wed, 13 Oct 2021 20:51:52 -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 S230156AbhJNDvZ (ORCPT + 99 others); Wed, 13 Oct 2021 23:51:25 -0400 Received: from twspam01.aspeedtech.com ([211.20.114.71]:64255 "EHLO twspam01.aspeedtech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230189AbhJNDuy (ORCPT ); Wed, 13 Oct 2021 23:50:54 -0400 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 19E3QcPi006363; 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:16 +0800 From: Jammy Huang To: , , , , , , , , Subject: [PATCH 5/6] media: aspeed: add comments and macro Date: Thu, 14 Oct 2021 11:48:18 +0800 Message-ID: <20211014034819.2283-6-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 19E3QcPi006363 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add comments to describe video-stat and 'struct aspeed_video'. Add macro, ASPEED_VIDEO_V4L2_MIN_BUF_REQ, to describe the buffers needed. Signed-off-by: Jammy Huang --- drivers/media/platform/aspeed-video.c | 39 ++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index 6b887fcaab7c..e1031fd09ac6 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -37,6 +37,8 @@ #define V4L2_CID_ASPEED_HQ_MODE (ASPEED_CID_CUSTOM_BASE + 3) #define V4L2_CID_ASPEED_HQ_JPEG_QUALITY (ASPEED_CID_CUSTOM_BASE + 4) +#define ASPEED_VIDEO_V4L2_MIN_BUF_REQ 3 + #define LOG_REG BIT(4) #define LOG_DEBUG BIT(3) #define LOG_TRACE BIT(2) @@ -213,6 +215,15 @@ #define VE_MEM_RESTRICT_START 0x310 #define VE_MEM_RESTRICT_END 0x314 +/* + * @VIDEO_MODE_DETECT_DONE: a flag raised if signal lock + * @VIDEO_RES_CHANGE: a flag raised if res_change work on-going + * @VIDEO_RES_DETECT: a flag raised if res. detection on-going + * @VIDEO_STREAMING: a flag raised if user requires stream-on + * @VIDEO_FRAME_INPRG: a flag raised if hw working on a frame + * @VIDEO_STOPPED: a flag raised if device release + * @VIDEO_CLOCKS_ON: a flag raised if clk is on + */ enum { VIDEO_MODE_DETECT_DONE, VIDEO_RES_CHANGE, @@ -245,6 +256,28 @@ struct aspeed_video_perf { #define to_aspeed_video_buffer(x) \ container_of((x), struct aspeed_video_buffer, vb) +/** + * struct aspeed_video - driver data + * + * @flags: holds the state of video + * @sequence: holds the last number of frame completed + * @max_compressed_size:holds max compressed stream's size + * @srcs: holds the buffer information for srcs + * @jpeg: holds the buffer information for jpeg header + * @bcd: holds the buffer information for bcd work + * @yuv420: a flag raised if JPEG subsampling is 420 + * @partial_jpeg: a flag raised if JPEG supports partial capture + * @hq_mode: a flag raised if HQ is enabled. Only for partial_jpeg + * @frame_rate: holds the frame_rate + * @jpeg_quality: holds jpeq's quality (0~11) + * @jpeg_hq_quality: holds hq's quality (0~11) only if hq_mode enabled + * @compression_mode: holds jpeg compression mode + * @frame_bottom: end position of video data in vertical direction + * @frame_left: start position of video data in horizontal direction + * @frame_right: end position of video data in horizontal direction + * @frame_top: start position of video data in vertical direction + * @perf: holds the statistics primary for debugfs + */ struct aspeed_video { void __iomem *base; struct clk *eclk; @@ -1250,7 +1283,7 @@ static int aspeed_video_get_parm(struct file *file, void *fh, struct aspeed_video *video = video_drvdata(file); a->parm.capture.capability = V4L2_CAP_TIMEPERFRAME; - a->parm.capture.readbuffers = 3; + a->parm.capture.readbuffers = ASPEED_VIDEO_V4L2_MIN_BUF_REQ; a->parm.capture.timeperframe.numerator = 1; if (!video->frame_rate) a->parm.capture.timeperframe.denominator = MAX_FRAME_RATE; @@ -1267,7 +1300,7 @@ static int aspeed_video_set_parm(struct file *file, void *fh, struct aspeed_video *video = video_drvdata(file); a->parm.capture.capability = V4L2_CAP_TIMEPERFRAME; - a->parm.capture.readbuffers = 3; + a->parm.capture.readbuffers = ASPEED_VIDEO_V4L2_MIN_BUF_REQ; if (a->parm.capture.timeperframe.numerator) frame_rate = a->parm.capture.timeperframe.denominator / @@ -1876,7 +1909,7 @@ static int aspeed_video_setup_video(struct aspeed_video *video) vbq->drv_priv = video; vbq->buf_struct_size = sizeof(struct aspeed_video_buffer); vbq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - vbq->min_buffers_needed = 3; + vbq->min_buffers_needed = ASPEED_VIDEO_V4L2_MIN_BUF_REQ; rc = vb2_queue_init(vbq); if (rc) { -- 2.25.1